docker file updates -> go 1.22 / removed unneeded items

EskoDijk · Jun 8, 2024 · e96cdd9 · e96cdd9
1 parent ff90298
commit e96cdd9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 109 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -59,7 +59,7 @@ jobs:
           submodules: recursive
           fetch-depth: 0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Prepare
         id: prepare
         run: |

diff --git a/etc/docker/environment/Dockerfile b/etc/docker/environment/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023, The OTNS Authors.
+# Copyright (c) 2022-2024, The OTNS Authors.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-FROM golang:1.18
+FROM golang:1.22
 
 RUN apt-get update && apt-get install -y python3 python3-pip sudo unzip nodejs npm git && rm -rf /var/lib/apt/lists/*
 

diff --git a/etc/docker/playground/Dockerfile b/etc/docker/playground/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, The OTNS Authors.
+# Copyright (c) 2020-2024, The OTNS Authors.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,21 +25,16 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # Stage 0: build OTNS and dependencies
-FROM golang:1.18
+FROM golang:1.22
 
 RUN apt-get update
 RUN apt-get install -y python3 python3-pip unzip
 
 COPY . /otns
 WORKDIR /otns
 RUN ./script/install-deps
+RUN ./script/test build-openthread-versions
 RUN ./script/install
-WORKDIR /otns/ot-rfsim
-RUN ./script/bootstrap
-RUN ./script/build_latest
-RUN ./script/build_v11
-RUN ./script/build_v12
-RUN ./script/build_v13
 
 RUN strip /go/bin/grpcwebproxy /go/bin/otns
 

diff --git a/ot-rfsim/script/bootstrap b/ot-rfsim/script/bootstrap