From 1de536d5f370f31727d9d2edbd6dfb7e1ecd1eae Mon Sep 17 00:00:00 2001 From: Tim Huynh Date: Thu, 11 Apr 2024 09:59:23 -0500 Subject: [PATCH] chore: update alpine (#64) * update alpine * update openssh to 9.6 * update workflow --------- Co-authored-by: TimHuynh --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/test.yml | 2 +- .gitignore | 1 + Dockerfile.scp | 2 +- Dockerfile.ssh | 2 +- Makefile | 2 +- go.mod | 2 +- go.sum | 4 ++-- test/Dockerfile.ssh-server | 6 +++--- 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6eb99e4..64dfd63 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,7 +39,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2 + uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -50,7 +50,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2 + uses: github/codeql-action/autobuild@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -64,4 +64,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2 + uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8c85ba4..e99b668 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: go test -covermode=atomic -coverprofile=coverage.out ./... - name: coverage - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3 + uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4 with: token: ${{ secrets.CODECOV_TOKEN }} file: coverage.out diff --git a/.gitignore b/.gitignore index 7501a44..6f9123a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ go.work release/ .DS_Store +.idea/ \ No newline at end of file diff --git a/Dockerfile.scp b/Dockerfile.scp index d89e495..1ea349d 100644 --- a/Dockerfile.scp +++ b/Dockerfile.scp @@ -4,7 +4,7 @@ ## docker build --no-cache -t vela-scp:local . ## ############################################################### -FROM alpine:3.19@sha256:51b67269f354137895d43f3b3d810bfacd3945438e94dc5ac55fdac340352f48 +FROM alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 # Build args to be used from the Makefile ARG OPENSSH_VERSION diff --git a/Dockerfile.ssh b/Dockerfile.ssh index 1c37e72..0332a9d 100644 --- a/Dockerfile.ssh +++ b/Dockerfile.ssh @@ -4,7 +4,7 @@ ## docker build --no-cache -t vela-ssh:local . ## ############################################################### -FROM alpine:3.19@sha256:51b67269f354137895d43f3b3d810bfacd3945438e94dc5ac55fdac340352f48 +FROM alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 # Build args to be used from the Makefile ARG OPENSSH_VERSION diff --git a/Makefile b/Makefile index 14e89e6..32b9635 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # the integration tests, and the static build flags for Go. # Note: No space between the equals and the value else issues arise. # renovate: datasource=repology depName=alpine_3_19/openssh versioning=loose -OPENSSH_VERSION=9.5_p1-r0 +OPENSSH_VERSION=9.6_p1-r0 # renovate: datasource=repology depName=alpine_3_19/sshpass versioning=loose SSHPASS_VERSION=1.10-r0 diff --git a/go.mod b/go.mod index 41d2319..7b9a5f3 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/sirupsen/logrus v1.9.3 github.com/spf13/afero v1.11.0 - github.com/urfave/cli/v2 v2.26.0 + github.com/urfave/cli/v2 v2.27.1 ) require ( diff --git a/go.sum b/go.sum index e84852e..972d0b3 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNo github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/urfave/cli/v2 v2.26.0 h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI= -github.com/urfave/cli/v2 v2.26.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= +github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho= +github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/test/Dockerfile.ssh-server b/test/Dockerfile.ssh-server index 4c895c7..83bda91 100644 --- a/test/Dockerfile.ssh-server +++ b/test/Dockerfile.ssh-server @@ -1,9 +1,9 @@ -FROM alpine:3.19@sha256:51b67269f354137895d43f3b3d810bfacd3945438e94dc5ac55fdac340352f48 +FROM alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 # renovate: datasource=repology depName=alpine_3_19/openssh versioning=loose -ENV OPENSSH_VERSION=9.5_p1-r0 +ENV OPENSSH_VERSION=9.6_p1-r0 # renovate: datasource=repology depName=alpine_3_19/openssh-sftp-server versioning=loose -ENV OPENSSH_SFTP_SERVER_VERSION=9.5_p1-r0 +ENV OPENSSH_SFTP_SERVER_VERSION=9.6_p1-r0 RUN apk add openssh=${OPENSSH_VERSION} openssh-sftp-server=${OPENSSH_SFTP_SERVER_VERSION} && \ adduser -D vela -h /home/vela && \