Skip to content

Commit

Permalink
ci/fix: use correct proxy verisons for pipeline (#10)
Browse files Browse the repository at this point in the history
* debug docker build step

* debug prisma version

* copy other app setup

* update proxies

* fetch proxies from vault

* revert to previous versions of prisma

* add package-lock

* reset pipeline conditions

* restore Dockerfile
  • Loading branch information
fredrikmonsen authored Nov 7, 2024
1 parent 9eb74ce commit 1b3f761
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ jobs:
secretId: ${{ secrets.VAULT_SECRET_ID }}
secrets: |
kv/team/text/data/harbor * ;
kv/team/text/data/ammo-stage *
kv/team/text/data/ammo-stage * ;
kv/team/text/data/ci-proxy *
- name: Log in to Harbor
uses: docker/login-action@v3
Expand Down Expand Up @@ -100,7 +101,8 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
file: Dockerfile
build-args: |
PROXY=${{ secrets.PROXY }}
HTTP_PROXY=${{ steps.import-secrets.outputs.HTTP_PROXY }}
HTTPS_PROXY=${{ steps.import-secrets.outputs.HTTPS_PROXY }}
deploy-to-stage:
name: Deploy stage environment
Expand Down
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
FROM node:20-alpine AS base
FROM node:20.17.0-alpine AS base

FROM base AS deps

ARG PROXY
ARG HTTP_PROXY
ARG HTTPS_PROXY

ENV HTTP_PROXY=$PROXY
ENV HTTPS_PROXY=$PROXY
ENV HTTP_PROXY=$HTTP_PROXY
ENV HTTPS_PROXY=$HTTPS_PROXY

RUN apk add --no-cache libc6-compat
WORKDIR /app
Expand Down

0 comments on commit 1b3f761

Please sign in to comment.