3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-04-30 19:06:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

core/go: upgrade go (#4644)

Browse source
This commit is contained in:
Caleb Doxsey 2023-10-27 09:04:13 -06:00 • committed by GitHub
parent 818f3926bf
commit dd7e3b993c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
go-version: [1.20.x] go-version: [1.21.x]
node-version: [16.x] node-version: [16.x]
platform: [ubuntu-latest] platform: [ubuntu-latest]
runs-on: ${{ matrix.platform }} runs-on: ${{ matrix.platform }}

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

@ -15,7 +15,7 @@ jobs:
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with: with:
go-version: 1.20.x go-version: 1.21.x
cache: false cache: false
- run: make deps-build - run: make deps-build

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

@ -33,7 +33,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with: with:
go-version: 1.20.x go-version: 1.21.x
cache: false cache: false
- name: Set up Docker - name: Set up Docker

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

@ -12,7 +12,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
go-version: [1.20.x] go-version: [1.21.x]
node-version: [16.x] node-version: [16.x]
platform: [ubuntu-latest] platform: [ubuntu-latest]
deployment: [multi, single] deployment: [multi, single]
@ -52,7 +52,7 @@ jobs:
build: build:
strategy: strategy:
matrix: matrix:
go-version: [1.20.x] go-version: [1.21.x]
node-version: [16.x] node-version: [16.x]
platform: [ubuntu-latest, macos-latest] platform: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.platform }} runs-on: ${{ matrix.platform }}
@ -125,7 +125,7 @@ jobs:
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
with: with:
go-version: 1.20.x go-version: 1.21.x
cache: false cache: false
- uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 - uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1

2
.tool-versions
View file

@ -1 +1 @@
golang 1.20.10 golang 1.21.3

4
Dockerfile
View file

@ -1,4 +1,4 @@
FROM node:lts-buster@sha256:2daec43046b715994ce9c816b9c91478a0d5fb79029b59e45da277e2935cf558 as ui FROM node:lts-bookworm@sha256:42a4d97d4abf2f278c323370cf9c8dbccc2a238acceebceb53711926ecfb4110 as ui
WORKDIR /build WORKDIR /build
COPY .git ./.git COPY .git ./.git
@ -13,7 +13,7 @@ RUN make yarn
COPY ./ui/ ./ui/ COPY ./ui/ ./ui/
RUN make build-ui RUN make build-ui
FROM golang:1.20.5-buster@sha256:eb3f9ac805435c1b2c965d63ce460988e1000058e1f67881324746362baf9572 as build FROM golang:1.21.3-bookworm@sha256:d0214956a9c50c300e430c1f6c0a820007ace238e5242c53762e61b344659e05 as build
WORKDIR /go/src/github.com/pomerium/pomerium WORKDIR /go/src/github.com/pomerium/pomerium
RUN apt-get update \ RUN apt-get update \

6
Dockerfile.debug
View file

@ -1,4 +1,4 @@
FROM node:lts-buster@sha256:2daec43046b715994ce9c816b9c91478a0d5fb79029b59e45da277e2935cf558 as ui FROM node:lts-bookworm@sha256:42a4d97d4abf2f278c323370cf9c8dbccc2a238acceebceb53711926ecfb4110 as ui
WORKDIR /build WORKDIR /build
COPY .git ./.git COPY .git ./.git
@ -13,7 +13,7 @@ RUN make yarn
COPY ./ui/ ./ui/ COPY ./ui/ ./ui/
RUN make build-ui RUN make build-ui
FROM golang:1.20.5-buster@sha256:eb3f9ac805435c1b2c965d63ce460988e1000058e1f67881324746362baf9572 as build FROM golang:1.21.3-bookworm@sha256:d0214956a9c50c300e430c1f6c0a820007ace238e5242c53762e61b344659e05 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-debug NAME=pomerium
RUN touch /config.yaml RUN touch /config.yaml
RUN go install github.com/go-delve/delve/cmd/dlv@latest RUN go install github.com/go-delve/delve/cmd/dlv@latest
FROM debian:latest@sha256:432f545c6ba13b79e2681f4cc4858788b0ab099fc1cca799cc0fae4687c69070 FROM debian:bookworm@sha256:22cc4de537485807b7efe6f4c942d7460c4482852f49434f9c022c044c545a90
ENV AUTOCERT_DIR /data/autocert ENV AUTOCERT_DIR /data/autocert
WORKDIR /pomerium WORKDIR /pomerium
COPY --from=build /go/src/github.com/pomerium/pomerium/bin/* /bin/ COPY --from=build /go/src/github.com/pomerium/pomerium/bin/* /bin/