Dockerfile: update base image

cyber-dojo · May 21, 2024 · 4e163c1 · 4e163c1
1 parent a508bff
commit 4e163c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 131 deletions.
diff --git a/.snyk b/.snyk
@@ -7,134 +7,4 @@ ignore:
         reason: Waiting for base image upgrade
         expires: 2024-03-01T15:47:10.182Z
         created: 2023-11-18T15:47:10.201Z
-  SNYK-GOLANG-GOLANGORGXNETHTTP2-5953327:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2023-10-11T21:18:57.642Z
-  SNYK-GOLANG-GOOPENTELEMETRYIOCONTRIBINSTRUMENTATIONNETHTTPOTELHTTP-5963583:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:47:46.719Z
-        created: 2023-11-18T15:47:46.736Z
-  SNYK-GOLANG-GOOPENTELEMETRYIOCONTRIBINSTRUMENTATIONNETHTTPOTELHTTP-5971109:
-    - '*':
-        reason: No fix yet available in docker-in-docker base image
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2023-10-18T11:29:48.324Z
-  SNYK-GOLANG-GOOPENTELEMETRYIOCONTRIBINSTRUMENTATIONNETHTTPHTTPTRACEOTELHTTPTRACE-5971114:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2023-11-18T15:48:22.228Z
-  SNYK-GOLANG-GOOGLEGOLANGORGPROTOBUFENCODINGPROTOJSON-6137908:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-01-12T15:48:22.228Z
-  SNYK-GOLANG-GOLANGORGXCRYPTOSSH-6130669:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-01-12T15:48:22.228Z
-  SNYK-ALPINE318-OPENSSH-6139287:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-01-12T15:48:22.228Z
-  SNYK-ALPINE319-OPENSSH-6131646:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-01-12T15:48:22.228Z
-  SNYK-ALPINE318-OPENSSL-6152404:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-01-12T15:48:22.228Z
-  SNYK-ALPINE319-OPENSSL-6159994:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-01-12T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITUTILTRACINGTRANSFORM-6230692:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITEXPORTERCONTAINERIMAGE-6226340:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITEXECUTOR-6209341:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITCONTROL-6226339:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMOPENCONTAINERSRUNCLIBCONTAINERCGROUPS-6209335:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITWORKER-6209365:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITUTILENTITLEMENTS-6209364:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITSOLVERLLBSOLVER-6209363:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITSNAPSHOT-6209339:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITSNAPSHOT-6209362:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITFRONTENDGATEWAYFORWARDER-6209361:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITFRONTENDGATEWAY-6209359:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITEXECUTOROCI-6209338:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITEXECUTOR-6209357:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMMOBYBUILDKITCLIENT-6209355:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
-  SNYK-GOLANG-GITHUBCOMCONTAINERDCONTAINERD-6219724:
-    - '*':
-        reason: Waiting for base image upgrade
-        expires: 2024-03-01T15:48:22.212Z
-        created: 2024-02-10T15:48:22.228Z
 patch: {}
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=docker:24.0.9-alpine3.19
+ARG BASE_IMAGE=docker:26.1.3-alpine3.19
 FROM ${BASE_IMAGE}
 LABEL maintainer=jon@jaggersoft.com
 
@@ -17,6 +17,9 @@ RUN apk --update --upgrade --no-cache add \
     tini \
     util-linux
 
+RUN apk add busybox=1.36.1-r17 # https://security.snyk.io/vuln/SNYK-ALPINE319-BUSYBOX-6913413
+RUN apk add openssl=3.1.5-r0   # https://security.snyk.io/vuln/SNYK-ALPINE319-OPENSSL-6928853
+
 WORKDIR /app
 COPY Gemfile .