From 6e0ce8e3045112727ae5333779b5f72c2b0eeab4 Mon Sep 17 00:00:00 2001 From: Ivan Krutov Date: Mon, 29 Jan 2024 11:26:23 +0300 Subject: [PATCH] Using Golang based on Debian 11 for upx-ucl package --- selenium/android/Dockerfile | 6 ++---- selenium/base/Dockerfile | 2 +- selenium/external-host/Dockerfile | 2 +- static/chrome/Dockerfile | 2 +- static/safari/Dockerfile | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/selenium/android/Dockerfile b/selenium/android/Dockerfile index 5eac17777..648f7f300 100644 --- a/selenium/android/Dockerfile +++ b/selenium/android/Dockerfile @@ -1,12 +1,10 @@ -FROM golang:1.21 as go +FROM golang:1.21-bullseye as go COPY tmp/devtools /devtools RUN \ apt-get update && \ - wget -c http://ftp.us.debian.org/debian/pool/main/u/upx-ucl/upx-ucl_3.95-1_amd64.deb && \ - apt-get install -y ./upx-ucl_3.95-1_amd64.deb && \ - apt-get install -y libx11-dev && \ + apt-get install -y upx-ucl libx11-dev && \ cd /devtools && \ GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" && \ upx /devtools/devtools diff --git a/selenium/base/Dockerfile b/selenium/base/Dockerfile index 088a14754..1717afa38 100644 --- a/selenium/base/Dockerfile +++ b/selenium/base/Dockerfile @@ -1,6 +1,6 @@ ARG UBUNTU_VERSION=22.04 -FROM golang:1.21 as go +FROM golang:1.21-bullseye as go COPY xseld /xseld diff --git a/selenium/external-host/Dockerfile b/selenium/external-host/Dockerfile index 357d888a8..e5101748b 100644 --- a/selenium/external-host/Dockerfile +++ b/selenium/external-host/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21 as go +FROM golang:1.21-bullseye as go COPY choose /choose diff --git a/static/chrome/Dockerfile b/static/chrome/Dockerfile index c974a0a7e..eb8ae06fb 100644 --- a/static/chrome/Dockerfile +++ b/static/chrome/Dockerfile @@ -1,5 +1,5 @@ ARG VERSION -FROM golang:1.21 as go +FROM golang:1.21-bullseye as go COPY devtools /devtools diff --git a/static/safari/Dockerfile b/static/safari/Dockerfile index e4d121c34..3a4d06a87 100644 --- a/static/safari/Dockerfile +++ b/static/safari/Dockerfile @@ -14,7 +14,7 @@ RUN \ ninja install && \ rm -Rf /var/lib/apt/lists/* -FROM golang:1.21 as go +FROM golang:1.21-bullseye as go COPY cmd/prism /prism