go: fix installation of go lang (sudo needed) and rolllback version o…

…f go in benchmark
mickamy · Jan 4, 2024 · 53a64ef · 53a64ef
1 parent 6ba3360
commit 53a64ef
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/docker/app/base/Dockerfile b/docker/app/base/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=ubuntu:18.04
+ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
 ENV LANG en_US.UTF-8

diff --git a/docker/app/go/Dockerfile b/docker/app/go/Dockerfile
@@ -2,13 +2,19 @@ ARG BASE_IMAGE=showwin/ishocon2_app_base:latest
 FROM ${BASE_IMAGE}
 
 # Go のインストール
+ARG TARGETARCH
+ENV GOARCH ${TARGETARCH}
+
 RUN sudo apt-get update
-RUN sudo wget -q https://dl.google.com/go/go1.15.8.linux-amd64.tar.gz && \
-    sudo tar -C /usr/local -xzf go1.15.8.linux-amd64.tar.gz && \
-    sudo rm go1.15.8.linux-amd64.tar.gz
+
+# Go のインストール
+ARG TARGETARCH
+RUN sudo wget -q https://dl.google.com/go/go1.15.8.linux-${TARGETARCH}.tar.gz && \
+    sudo tar -C /usr/local -xzf go1.15.8.linux-${TARGETARCH}.tar.gz && \
+    sudo rm go1.15.8.linux-${TARGETARCH}.tar.gz
 ENV PATH $PATH:/usr/local/go/bin
 ENV GOROOT /usr/local/go
-ENV GOPATH /home/ishocon/.local/go
+ENV GOPATH $HOME/.local/go
 ENV PATH $PATH:$GOROOT/bin
 
 # アプリケーション
@@ -21,4 +27,4 @@ COPY run.sh /home/ishocon/run.sh
 COPY docker/app/entrypoint.sh /home/ishocon/docker/app/entrypoint.sh
 ENTRYPOINT ["/home/ishocon/docker/app/entrypoint.sh"]
 
-CMD cd ~/webapp/go && go build -o webapp *.go && ./webapp
+CMD cd ~/webapp/go && GOARCH=${TARGETARCH} go build -x -o webapp *.go && ./webapp
diff --git a/docker/benchmarker/Dockerfile b/docker/benchmarker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=ubuntu:18.04
+ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
 ENV LANG en_US.UTF-8
@@ -15,9 +15,9 @@ RUN apt-get update && \
 
 # Go のインストール
 ARG TARGETARCH
-RUN echo https://dl.google.com/go/go1.15.8.linux-${TARGETARCH}.tar.gz
-RUN wget -q https://dl.google.com/go/go1.15.8.linux-${TARGETARCH}.tar.gz && \
-    tar -C /usr/local -xzf go1.15.8.linux-${TARGETARCH}.tar.gz
+RUN wget -q https://dl.google.com/go/go1.13.15.linux-${TARGETARCH}.tar.gz && \
+    tar -C /usr/local -xzf go1.13.15.linux-${TARGETARCH}.tar.gz && \
+    rm go1.13.15.linux-${TARGETARCH}.tar.gz
 ENV PATH $PATH:/usr/local/go/bin
 ENV GOROOT /usr/local/go
 ENV GOPATH $HOME/.local/go