Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
d94bcbce
Unverified
Commit
d94bcbce
authored
2 years ago
by
Erik Johnston
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix pinning Rust deps in docker images (#14129)
parent
f1673866
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.dockerignore
+1
-0
1 addition, 0 deletions
.dockerignore
changelog.d/14129.bugfix
+1
-0
1 addition, 0 deletions
changelog.d/14129.bugfix
docker/Dockerfile
+1
-1
1 addition, 1 deletion
docker/Dockerfile
with
3 additions
and
1 deletion
.dockerignore
+
1
−
0
View file @
d94bcbce
...
...
@@ -9,6 +9,7 @@
!pyproject.toml
!poetry.lock
!Cargo.lock
!Cargo.toml
!build_rust.py
rust/target
...
...
This diff is collapsed.
Click to expand it.
changelog.d/14129.bugfix
0 → 100644
+
1
−
0
View file @
d94bcbce
Fix an issue with Docker images causing the Rust dependencies to not be pinned correctly.
This diff is collapsed.
Click to expand it.
docker/Dockerfile
+
1
−
1
View file @
d94bcbce
...
...
@@ -121,7 +121,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
COPY
synapse /synapse/synapse/
COPY
rust /synapse/rust/
# ... and what we need to `pip install`.
COPY
pyproject.toml README.rst build_rust.py /synapse/
COPY
pyproject.toml README.rst build_rust.py
Cargo.toml Cargo.lock
/synapse/
# Repeat of earlier build argument declaration, as this is a new build stage.
ARG
TEST_ONLY_IGNORE_POETRY_LOCKFILE
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment