feat: Update editor-server.

gsmlg-dev · Jun 6, 2024 · 99eef7d · 99eef7d
1 parent 92a3b2a
commit 99eef7d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 24 deletions.
diff --git a/.github/workflows/docker-buildimage-editor-server.yml b/.github/workflows/docker-buildimage-editor-server.yml
@@ -85,6 +85,8 @@ jobs:
           push: true
           build-args: |
             VERSION=latest
+            BUILD_MONTH=${{ steps.build-date.outputs.ym }}
+            BUILD_DATE=${{ steps.build-date.outputs.date }}
           tags: |
             ghcr.io/gsmlg/editor-server:latest
             docker.io/gsmlg/editor-server:latest
diff --git a/docker/editor-server/Dockerfile b/docker/editor-server/Dockerfile
@@ -1,13 +1,17 @@
-ARG CODE_SERVER_VERSION=4.22.1
+ARG CODE_SERVER_VERSION=4.89.1
 FROM ghcr.io/gsmlg/code-server:v$CODE_SERVER_VERSION
 
+ARG BUILD_DATE
+ARG BUILD_MONTH
+
 ENV CODE_SERVER_VERSION=$CODE_SERVER_VERSION
 LABEL CODE_SERVER_VERSION=$CODE_SERVER_VERSION
 LABEL maintainer="Jonathan Gao <gsmlg.com@gmail.com>"
 
 LABEL org.opencontainers.image.source="https://github.com/gsmlg-dev/Foundation/tree/main/docker/editor-server"
 LABEL org.opencontainers.image.description="Jonathan Gao's personal code-server, with his common dev envrionment."
 LABEL org.opencontainers.image.licenses=MIT
+LABEL org.opencontainers.image.build-date=$BUILD_DATE
 
 ARG VERSION
 LABEL VERSION=$VERSION
@@ -100,7 +104,7 @@ RUN curl -sL https://deb.nodesource.com/setup_${NODEJS_VERSION}.x | bash - \
   && /usr/bin/node /usr/lib/node_modules/@openapitools/openapi-generator-cli/main.js version
 
 # install golang
-ARG GO_VERSION=1.21.4
+ARG GO_VERSION=1.22.1
 ARG GO111MODULE=on
 ARG GOPATH=/opt/go
 ENV GOPATH=$GOPATH
@@ -137,34 +141,14 @@ RUN apt-get install -y -qq python3 python3-pip python3-full \
   && python3 -m pip install --break-system-packages huggingface_hub \
   && python3 -m pip install --break-system-packages jupyterlab
 
-# install rust
-ARG RUSTPATH=/opt/rust
-ENV RUSTUP_HOME=${RUSTPATH}
-ENV CARGO_HOME=${RUSTPATH}
-RUN export RUSTUP_HOME=${RUSTPATH} \
-  && export CARGO_HOME=${RUSTPATH} \
-  && echo "export PATH=\${PATH}:${RUSTPATH}/bin" | tee -a "/etc/zsh/zshenv" \
-  && echo "export RUSTUP_HOME=${RUSTPATH}" | tee -a "/etc/zsh/zshenv" \
-  && echo "export CARGO_HOME=${RUSTPATH}" | tee -a "/etc/zsh/zshenv" \
-  && curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path \
-  && /opt/rust/bin/rustup target add wasm32-unknown-unknown \
-  && /opt/rust/bin/rustup target add x86_64-apple-darwin \
-  && /opt/rust/bin/rustup target add aarch64-apple-darwin \
-  && /opt/rust/bin/rustup target add aarch64-linux-android \
-  && /opt/rust/bin/cargo install difftastic \
-  && /opt/rust/bin/cargo install cargo-generate \
-  && /opt/rust/bin/cargo install wasm-pack \
-  && /opt/rust/bin/cargo install trunk wasm-bindgen-cli \
-  && chown -R coder:coder "${RUSTPATH}"
-
 # install php
 RUN apt-get install -y -qq php-cli
 
 # install ruby
 RUN apt-get install -y -qq ruby-full && gem install bundler jekyll jekyll-remote-theme
 
 # install flutter
-ARG FLUTTER_VERSION=3.19.5
+ARG FLUTTER_VERSION=3.22.1
 ARG PUB_CACHE=/opt/flutter/pub-cache
 ENV PUB_CACHE=${PUB_CACHE}
 ENV FLUTTER_VERSION=${FLUTTER_VERSION}
@@ -176,10 +160,11 @@ RUN apt-get install -y -qq clang cmake ninja-build pkg-config libgtk-3-dev liblz
   && rm -f flutter.tar.xz \
   && /opt/flutter/bin/dart pub global activate mason_cli \
   && /opt/flutter/bin/dart pub global activate vscode_ext_cli \
+  && /opt/flutter/bin/dart pub global activate translate_arb_cli \
   && /opt/flutter/bin/dart pub global activate melos
 
 # install kubectl
-ARG KUBECTL_VERSION=1.28.7
+ARG KUBECTL_VERSION=1.30.1
 RUN export ARCH=`dpkg --print-architecture`; \
   curl -sSfLo kubectl "https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/${ARCH}/kubectl" \
   && chmod +x kubectl \