Skip to content

Commit

Permalink
Use root user in Wave container based on micromamba (#4038) [ci fast]
Browse files Browse the repository at this point in the history
Signed-off-by: Marco De La Pierre <[email protected]>
  • Loading branch information
marcodelapierre authored Aug 15, 2023
1 parent 552501c commit a3a75ea
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ COPY --chown=$MAMBA_USER:$MAMBA_USER conda.yml /tmp/conda.yml
RUN micromamba install -y -n base -f /tmp/conda.yml \
{{base_packages}}
&& micromamba clean -a -y
USER root
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ RUN \
{{target}} \
{{base_packages}}
&& micromamba clean -a -y
USER root
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ class WaveClientTest extends Specification {
micromamba install -y -n base -c conda-forge -c defaults \\
salmon=1.2.3 \\
&& micromamba clean -a -y
USER root
'''.stripIndent()
and:
!assets.moduleResources
Expand Down Expand Up @@ -544,6 +545,7 @@ class WaveClientTest extends Specification {
COPY --chown=$MAMBA_USER:$MAMBA_USER conda.yml /tmp/conda.yml
RUN micromamba install -y -n base -f /tmp/conda.yml \\
&& micromamba clean -a -y
USER root
'''.stripIndent()
and:
assets.condaFile == condaFile
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class DockerHelperTest extends Specification {
RUN micromamba install -y -n base -f /tmp/conda.yml \\
&& micromamba install -y -n base conda-forge::procps-ng \\
&& micromamba clean -a -y
USER root
'''.stripIndent()
}

Expand All @@ -52,6 +53,7 @@ class DockerHelperTest extends Specification {
COPY --chown=$MAMBA_USER:$MAMBA_USER conda.yml /tmp/conda.yml
RUN micromamba install -y -n base -f /tmp/conda.yml \\
&& micromamba clean -a -y
USER root
'''.stripIndent()
}

Expand All @@ -67,6 +69,7 @@ class DockerHelperTest extends Specification {
micromamba install -y -n base -c conda-forge -c defaults \\
bwa=0.7.15 salmon=1.1.1 \\
&& micromamba clean -a -y
USER root
'''.stripIndent()
}

Expand All @@ -84,6 +87,7 @@ class DockerHelperTest extends Specification {
bwa=0.7.15 salmon=1.1.1 \\
&& micromamba install -y -n base foo::one bar::two \\
&& micromamba clean -a -y
USER root
'''.stripIndent()
}

Expand All @@ -99,6 +103,7 @@ class DockerHelperTest extends Specification {
micromamba install -y -n base -c foo -c bar \\
bwa=0.7.15 salmon=1.1.1 \\
&& micromamba clean -a -y
USER root
'''.stripIndent()
}

Expand All @@ -115,6 +120,7 @@ class DockerHelperTest extends Specification {
micromamba install -y -n base -c conda-forge -c defaults \\
bwa=0.7.15 salmon=1.1.1 \\
&& micromamba clean -a -y
USER root
USER my-user
RUN apt-get update -y && apt-get install -y nano
'''.stripIndent()
Expand All @@ -134,6 +140,7 @@ class DockerHelperTest extends Specification {
micromamba install -y -n base -c conda-forge -c defaults \\
-f https://foo.com/some/conda-lock.yml \\
&& micromamba clean -a -y
USER root
USER my-user
RUN apt-get update -y && apt-get install -y procps
'''.stripIndent()
Expand Down

0 comments on commit a3a75ea

Please sign in to comment.