From b4894ed4b6bafe1cc6c5346fd3ac05795d69da50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20K=C3=B8hler=20Warmdahl?= Date: Tue, 10 Dec 2024 15:36:59 +0100 Subject: [PATCH] New docker image --- .github/workflows/release.yaml | 5 ++--- scripts/desktop-wallet-ci.Dockerfile | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index de91f752e..c694807a0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -70,7 +70,6 @@ jobs: run: | set +e #aws ecr describe-images --registry-id "192549843005" --repository-name "concordium/desktop-wallet-ci" --region eu-west-1 --image-ids=imageTag=${{ steps.version_check.outputs.VERSION }} - #docker pull ${{ steps.version_check.outputs.CONTAINER_TAG }} echo "EC=254" >> $GITHUB_ENV #echo "EC=$?" >> $GITHUB_ENV - name: Set up Docker Buildx @@ -84,8 +83,8 @@ jobs: tags: "${{ steps.version_check.outputs.CONTAINER_TAG }}-dev" context: '.' file: 'scripts/desktop-wallet-ci.Dockerfile' - #cache-from: type=gha - #cache-to: type=gha,mode=max + cache-from: type=gha + cache-to: type=gha,mode=max build-args: | BASE_VERSION=${{ env.BASE_IMAGE_VERSION }} NODE_VERSION=${{ env.NODE_VERSION }} diff --git a/scripts/desktop-wallet-ci.Dockerfile b/scripts/desktop-wallet-ci.Dockerfile index 4e2edcede..884b1e202 100644 --- a/scripts/desktop-wallet-ci.Dockerfile +++ b/scripts/desktop-wallet-ci.Dockerfile @@ -12,9 +12,7 @@ RUN apt-get update && apt-get install -y \ libudev-dev \ libusb-1.0-0-dev \ rpm \ - awscli \ - sl \ - sed + awscli RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh @@ -25,4 +23,6 @@ RUN . $NVM_DIR/nvm.sh \ && npm install --global yarn \ && nvm use ${NODE_VERSION} +RUN echo "new thing" + ENV PATH=$NVM_DIR/versions/node/v${NODE_VERSION}/bin:${PATH}