diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2079e863..7db07fc7 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -23,20 +23,20 @@ jobs: language: [ 'go' ] steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v3 #- run: | # make bootstrap # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index fbf03c89..80f84b31 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,12 +16,12 @@ jobs: steps: - name: Install Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: - go-version: "1.19.x" + go-version: "1.24.x" - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Get Build Data id: info @@ -33,7 +33,7 @@ jobs: - name: Docker meta id: docker_meta - uses: crazy-max/ghaction-docker-meta@v1 + uses: crazy-max/ghaction-docker-meta@v5 with: images: cesanta/docker_auth tag-edge: true @@ -43,13 +43,13 @@ jobs: {{major}}.{{minor}} - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 with: platforms: all - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 with: install: true version: latest @@ -57,14 +57,14 @@ jobs: driver-opts: image=moby/buildkit:master - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} if: github.event_name == 'push' - name: Build and Push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: context: auth_server file: auth_server/Dockerfile diff --git a/.github/workflows/go_test.yml b/.github/workflows/go_test.yml index 2b5fa40c..50c4821b 100644 --- a/.github/workflows/go_test.yml +++ b/.github/workflows/go_test.yml @@ -4,16 +4,16 @@ jobs: test: strategy: matrix: - go-version: [1.17.x, 1.18.x, 1.19.x] + go-version: [1.23.x,1.24.x] os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: - name: Install Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Test run: | cd auth_server diff --git a/auth_server/Dockerfile b/auth_server/Dockerfile index 3c5a7004..c489ad6e 100644 --- a/auth_server/Dockerfile +++ b/auth_server/Dockerfile @@ -1,9 +1,9 @@ -FROM golang:1.19-alpine3.16 as build +FROM golang:1.24-alpine3.22 AS build ARG VERSION -ENV VERSION "${VERSION}" +ENV VERSION="${VERSION}" ARG BUILD_ID -ENV BUILD_ID "${BUILD_ID}" +ENV BUILD_ID="${BUILD_ID}" ARG CGO_EXTRA_CFLAGS RUN apk add -U --no-cache ca-certificates make git gcc musl-dev binutils-gold @@ -12,7 +12,7 @@ COPY . /build WORKDIR /build RUN make build -FROM alpine:3.19 +FROM alpine:3.22 COPY --from=build /build/auth_server /docker_auth/ COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ ENTRYPOINT ["/docker_auth/auth_server"] diff --git a/auth_server/authn/data/github_auth_result.tmpl b/auth_server/authn/data/github_auth_result.tmpl index 2619d0cd..513034ea 100644 --- a/auth_server/authn/data/github_auth_result.tmpl +++ b/auth_server/authn/data/github_auth_result.tmpl @@ -43,9 +43,11 @@
$ docker login -u {{.Username}} -p {{.Password}} {{if .RegistryUrl}}{{.RegistryUrl}}{{else}}docker.example.com{{end}}
+ $ podman login -u {{.Username}} -p {{.Password}} {{if .RegistryUrl}}{{.RegistryUrl}}{{else}}docker.example.com{{end}}
+ $ nerdctl login -u {{.Username}} -p {{.Password}} {{if .RegistryUrl}}{{.RegistryUrl}}{{else}}docker.example.com{{end}}