mirror of
https://github.com/pomerium/pomerium.git
synced 2025-07-24 12:08:19 +02:00
Merge branch 'main' into dependabot/docker/golang-1.19.5-buster
This commit is contained in:
commit
8462ee6396
3 changed files with 4 additions and 4 deletions
4
.github/workflows/docker-main.yaml
vendored
4
.github/workflows/docker-main.yaml
vendored
|
@ -47,7 +47,7 @@ jobs:
|
|||
echo ::set-output name=sha-tag::${SHA_TAG}
|
||||
|
||||
- name: Docker Publish - Main
|
||||
uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5
|
||||
uses: docker/build-push-action@37abcedcc1da61a57767b7588cb9d03eb57e28b3
|
||||
with:
|
||||
context: .
|
||||
file: ./Dockerfile
|
||||
|
@ -60,7 +60,7 @@ jobs:
|
|||
org.opencontainers.image.revision=${{ github.sha }}
|
||||
|
||||
- name: Docker Publish - Debug
|
||||
uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5
|
||||
uses: docker/build-push-action@37abcedcc1da61a57767b7588cb9d03eb57e28b3
|
||||
with:
|
||||
context: .
|
||||
file: ./Dockerfile.debug
|
||||
|
|
2
.github/workflows/test.yaml
vendored
2
.github/workflows/test.yaml
vendored
|
@ -209,7 +209,7 @@ jobs:
|
|||
uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325
|
||||
|
||||
- name: Docker Build
|
||||
uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5
|
||||
uses: docker/build-push-action@37abcedcc1da61a57767b7588cb9d03eb57e28b3
|
||||
with:
|
||||
context: .
|
||||
file: ./Dockerfile
|
||||
|
|
|
@ -30,7 +30,7 @@ RUN make build-go NAME=pomerium
|
|||
RUN touch /config.yaml
|
||||
|
||||
# build our own root trust store from current stable
|
||||
FROM debian:stable@sha256:7ca0fecd790bd1297cb92c4405906b0c4d7df22c8a5f0367a2697daf73c99cd7 as casource
|
||||
FROM debian:stable@sha256:12931ad2bfd4a9609cf8ef7898f113d67dce8058f0c27f01c90ef7bdd5a61bfb as casource
|
||||
RUN apt-get update && apt-get install -y ca-certificates
|
||||
# Remove expired root (https://github.com/pomerium/pomerium/issues/2653)
|
||||
RUN rm /usr/share/ca-certificates/mozilla/DST_Root_CA_X3.crt && update-ca-certificates
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue