Skip to content

Commit

Permalink
pin archspec version
Browse files Browse the repository at this point in the history
  • Loading branch information
bedroge committed Feb 27, 2024
1 parent 256d7ef commit 141afc2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion containers/Dockerfile.EESSI-build-node-debian11
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ARG cvmfsversion=2.11.2
ARG archspecversion=0.2.2
ARG awscliversion=1.32.22
ARG fuseoverlayfsversion=1.10

Expand All @@ -10,6 +11,7 @@ RUN sh /build-or-download-cvmfs-debs.sh ${cvmfsversion}

FROM debian:11.5
ARG cvmfsversion
ARG archspecversion
ARG awscliversion
ARG fuseoverlayfsversion

Expand Down Expand Up @@ -38,7 +40,7 @@ RUN mkdir -p /cvmfs/software.eessi.io
RUN useradd -ms /bin/bash eessi

# stick to awscli v1.x, 2.x is not available through PyPI (see https://github.com/aws/aws-cli/issues/4947)
RUN pip3 install archspec awscli==${awscliversion}
RUN pip3 install archspec==${archspecversion} awscli==${awscliversion}

RUN curl -OL https://raw.githubusercontent.com/EESSI/eessi-bot-software-layer/develop/scripts/eessi-upload-to-staging \
&& mv eessi-upload-to-staging /usr/bin \
Expand Down
4 changes: 3 additions & 1 deletion containers/Dockerfile.EESSI-build-node-debian12
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ARG cvmfsversion=2.11.2
ARG archspecversion=0.2.2
ARG awscliversion=1.32.22
ARG fuseoverlayfsversion=1.10

Expand All @@ -10,6 +11,7 @@ RUN sh /build-or-download-cvmfs-debs.sh ${cvmfsversion}

FROM debian:12.5
ARG cvmfsversion
ARG archspecversion
ARG awscliversion
ARG fuseoverlayfsversion

Expand Down Expand Up @@ -37,7 +39,7 @@ RUN mkdir -p /cvmfs/software.eessi.io

RUN useradd -ms /bin/bash eessi

RUN python3 -m venv /opt/archspec && . /opt/archspec/bin/activate && pip3 install archspec && deactivate && ln -s /opt/archspec/bin/archspec /usr/local/bin/archspec
RUN python3 -m venv /opt/archspec && . /opt/archspec/bin/activate && pip3 install archspec==${archspecversion} && deactivate && ln -s /opt/archspec/bin/archspec /usr/local/bin/archspec
# stick to awscli v1.x, 2.x is not available through PyPI (see https://github.com/aws/aws-cli/issues/4947)
RUN python3 -m venv /opt/awscli && . /opt/awscli/bin/activate && pip3 install awscli==${awscliversion} && deactivate && ln -s /opt/awscli/bin/aws /usr/local/bin/aws

Expand Down

0 comments on commit 141afc2

Please sign in to comment.