Revert "patch: aptでmysqlの署名キー期限切れが発生しておりインストールでコケるのをパッチする apache/airf…

…low#36231"
1natsu172 · Jan 15, 2024 · 829ac32 · 829ac32
1 parent e905e87
commit 829ac32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/webapp/go/Dockerfile b/webapp/go/Dockerfile
@@ -2,10 +2,7 @@ FROM golang:1.21.0-bookworm
 
 WORKDIR /tmp
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update &&\
-    apt-get install -y gnupg2 &&\
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C &&\
-    apt-get update && \
+RUN apt-get update && \
     apt-get -y upgrade && \
     apt-get install -y curl wget gcc g++ make sqlite3 locales locales-all && \
     wget -q https://dev.mysql.com/get/mysql-apt-config_0.8.29-1_all.deb && \

diff --git a/webapp/node/Dockerfile b/webapp/node/Dockerfile
@@ -2,10 +2,7 @@ FROM node:20.9.0-bullseye-slim
 
 WORKDIR /tmp
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update &&\
-    apt-get install -y gnupg2 &&\
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C &&\
-    apt-get update && \
+RUN apt-get update && \
     apt-get -y upgrade && \
     apt-get install -y curl wget gcc g++ make sqlite3 locales locales-all && \
     wget -q https://dev.mysql.com/get/mysql-apt-config_0.8.29-1_all.deb && \