3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-06-29 07:58:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into dependabot/docker/alpine-f271e74

Browse source
This commit is contained in:
Denis Mishin 2023-01-16 20:59:27 -05:00 • committed by GitHub
commit 4cc385cad0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/docker-main.yaml vendored
View file

@ -47,7 +47,7 @@ jobs:
echo ::set-output name=sha-tag::${SHA_TAG} echo ::set-output name=sha-tag::${SHA_TAG}
- name: Docker Publish - Main - name: Docker Publish - Main
uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 uses: docker/build-push-action@37abcedcc1da61a57767b7588cb9d03eb57e28b3
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile
@ -60,7 +60,7 @@ jobs:
org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.revision=${{ github.sha }}
- name: Docker Publish - Debug - name: Docker Publish - Debug
uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 uses: docker/build-push-action@37abcedcc1da61a57767b7588cb9d03eb57e28b3
with: with:
context: . context: .
file: ./Dockerfile.debug file: ./Dockerfile.debug

2
.github/workflows/test.yaml vendored
View file

@ -209,7 +209,7 @@ jobs:
uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325
- name: Docker Build - name: Docker Build
uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 uses: docker/build-push-action@37abcedcc1da61a57767b7588cb9d03eb57e28b3
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile

4
Dockerfile
View file

@ -13,7 +13,7 @@ RUN make yarn
COPY ./ui/ ./ui/ COPY ./ui/ ./ui/
RUN make build-ui RUN make build-ui
FROM golang:1.19.4-buster@sha256:7c97baef6d7a48c2520691e38cca1c56a86b0cad36831c01d959913711f30aa3 as build FROM golang:1.19.5-buster@sha256:150a98859da4c88935958d21d4fca1c74a139eac88e1eb2364c8f60d69236ede as build
WORKDIR /go/src/github.com/pomerium/pomerium WORKDIR /go/src/github.com/pomerium/pomerium
RUN apt-get update \ RUN apt-get update \
@ -30,7 +30,7 @@ RUN make build-go NAME=pomerium
RUN touch /config.yaml RUN touch /config.yaml
# build our own root trust store from current stable # 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 RUN apt-get update && apt-get install -y ca-certificates
# Remove expired root (https://github.com/pomerium/pomerium/issues/2653) # 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 RUN rm /usr/share/ca-certificates/mozilla/DST_Root_CA_X3.crt && update-ca-certificates

2
Dockerfile.debug
View file

@ -13,7 +13,7 @@ RUN make yarn
COPY ./ui/ ./ui/ COPY ./ui/ ./ui/
RUN make build-ui RUN make build-ui
FROM golang:1.19.4-buster@sha256:7c97baef6d7a48c2520691e38cca1c56a86b0cad36831c01d959913711f30aa3 as build FROM golang:1.19.5-buster@sha256:150a98859da4c88935958d21d4fca1c74a139eac88e1eb2364c8f60d69236ede as build
WORKDIR /go/src/github.com/pomerium/pomerium WORKDIR /go/src/github.com/pomerium/pomerium
RUN apt-get update \ RUN apt-get update \

2
go.mod
View file

@ -69,7 +69,7 @@ require (
golang.org/x/sync v0.1.0 golang.org/x/sync v0.1.0
google.golang.org/api v0.105.0 google.golang.org/api v0.105.0
google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6 google.golang.org/genproto v0.0.0-20221206210731-b1a01be3a5f6
google.golang.org/grpc v1.51.0 google.golang.org/grpc v1.52.0
google.golang.org/protobuf v1.28.1 google.golang.org/protobuf v1.28.1
gopkg.in/yaml.v3 v3.0.1 gopkg.in/yaml.v3 v3.0.1
namespacelabs.dev/go-filenotify v0.0.0-20220511192020-53ea11be7eaa namespacelabs.dev/go-filenotify v0.0.0-20220511192020-53ea11be7eaa

4
go.sum
View file

@ -1449,8 +1449,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= google.golang.org/grpc v1.52.0 h1:kd48UiU7EHsV4rnLyOJRuP/Il/UHE7gdDAQ+SZI7nZk=
google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=