diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fd0950d..b5ab36c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,10 +29,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - name: Log in to the Container registry uses: docker/login-action@v3 with: @@ -49,7 +45,6 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v4 with: - platforms: linux/amd64,linux/arm64/v8 target: production push: true tags: ${{ steps.meta.outputs.tags }} diff --git a/Dockerfile b/Dockerfile index 5439edb..9c40bf0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,14 +24,19 @@ ARG FRONTEND_APP_PATH="/app/frontend" FROM ${BUILDER_IMAGE} as base -ENV NODE_URL=https://deb.nodesource.com/setup_18.x +# Install node +ENV NODE_MAJOR=18 -# Install curl as a prerequisite for nodejs: -RUN apt-get -y update && apt-get install -y curl +RUN apt-get -y update + +RUN apt-get install -y ca-certificates curl gnupg +RUN mkdir -p /etc/apt/keyrings +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg + +RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list # install build dependencies -RUN curl -fsSL $NODE_URL | bash - && \ - apt-get install -y nodejs \ +RUN apt-get update && apt-get install -y nodejs \ build-essential \ inotify-tools \ postgresql-client \