Merge pull request #668 from vania-pooh/master

Using Golang based on Debian 11 for upx-ucl package
aerokube · Jan 29, 2024 · a8221cb · a8221cb
2 parents 4d576a1 + 6e0ce8e
commit a8221cb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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