Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
Dockerfiles for Jenkins
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre-Yves David
Dockerfiles for Jenkins
Commits
0880c1bd
Commit
0880c1bd
authored
6 months ago
by
Nicolas Dandrimont
Browse files
Options
Downloads
Patches
Plain Diff
bookworm-multipython: Fixup rust build instructions
They're not specific to rage anymore.
parent
3b62f1f0
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bookworm-multipython/Dockerfile
+9
-6
9 additions, 6 deletions
bookworm-multipython/Dockerfile
with
9 additions
and
6 deletions
bookworm-multipython/Dockerfile
+
9
−
6
View file @
0880c1bd
...
...
@@ -212,9 +212,9 @@ ENV PATH="${CARGO_HOME}/bin:${PATH}"
COPY
./prepare-cargo-cache ${CARGO_HOME}/bin
# install rage (for swh-alter)
FROM
build_bookworm_with_packages
as
build_rust
FROM
build_bookworm_with_packages
as
build_rage
# install rage (for swh-alter)
# Use the latest available version so we can detect if rage behavior has changed when
# testing swh-alter. Otherwise, this might only be detected when processing a
# takedown notice or restoring a bundle… which would not be a nice experience.
...
...
@@ -225,6 +225,9 @@ RUN --mount=type=secret,mode=0444,id=SCCACHE_REDIS_ENDPOINT \
CARGO_INCREMENTAL
=
0
\
cargo
install
rage
# Install rust-based swh-graph binaries to avoid compiling it on all test runs
# of its dependencies (e.g. swh-provenance)
RUN
--mount
=
type
=
secret,mode
=
0444,id
=
SCCACHE_REDIS_ENDPOINT
\
--mount
=
type
=
secret,mode
=
0444,id
=
SCCACHE_REDIS_PASSWORD
\
env-from-secrets
\
...
...
@@ -232,9 +235,9 @@ RUN --mount=type=secret,mode=0444,id=SCCACHE_REDIS_ENDPOINT \
CARGO_INCREMENTAL
=
0
\
cargo
install
swh-graph
--all-features
FROM
build_bookworm_with_packages
AS
build_bookworm_with_packages_and_r
age
COPY
--from=build_r
age
/home/${user}/.cargo/bin/rage /home/${user}/.cargo/bin/rage-keygen /home/${user}/.cargo/bin
COPY
--from=build_r
age
/home/${user}/.cargo/bin/swh-graph* /home/${user}/.cargo/bin
/rage-keygen /home/${user}/.cargo/bin
FROM
build_bookworm_with_packages
AS
build_bookworm_with_packages_and_r
ust
COPY
--from=build_r
ust
/home/${user}/.cargo/bin/rage /home/${user}/.cargo/bin/rage-keygen /home/${user}/.cargo/bin
COPY
--from=build_r
ust
/home/${user}/.cargo/bin/swh-graph* /home/${user}/.cargo/bin
RUN
rustup component add clippy
...
...
@@ -315,7 +318,7 @@ RUN --mount=type=secret,mode=0444,id=SCCACHE_REDIS_ENDPOINT \
MAKEOPTS
=
'-j8'
\
pyenv
install
--verbose
--keep
${
py312_version
}
FROM
build_bookworm_with_packages_and_r
age
FROM
build_bookworm_with_packages_and_r
ust
ENV
PYENV_ROOT "/home/${user}/.pyenv"
ENV
PATH="${PYENV_ROOT}/shims:${PATH}:${PYENV_ROOT}/bin"
...
...
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