liuyuqi-dellpc 1 year ago
parent
commit
85524a2488
3 changed files with 33 additions and 12 deletions
  1. 1 1
      flutter/.ide/Dockerfile
  2. 32 10
      flutter/.ide/Dockerfile-Allinone-flutter
  3. 0 1
      flutter/Dockerfile

+ 1 - 1
flutter/.ide/Dockerfile

@@ -1 +1 @@
-FROM sift-docker.pkg.coding.net/flutter-team/dev-container/dev-allinone:1.0.5-flutter
+FROM sift-docker.pkg.coding.net/flutter-team/dev-container/dev-:1.0.6-flutterallinone

+ 32 - 10
flutter/.ide/Dockerfile-Allinone-flutter

@@ -8,10 +8,11 @@ RUN sed -i s@/deb.debian.org/@/mirrors.aliyun.com/@g /etc/apt/sources.list
 RUN sed -i s@/security.debian.org/@/mirrors.aliyun.com/@g /etc/apt/sources.list
 
 RUN apt-get update && apt-get install -y \
-    curl zip wget \
-    && rm -rf /var/lib/apt/lists/*
+    curl unzip wget git vim
 
-# install java16
+RUN apt install build-essential -y
+
+# install java 21.0.1-ms
 RUN curl -s "https://get.sdkman.io" | bash
 RUN bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install java 21.0.1-ms"
 ENV JAVA_HOME /root/.sdkman/candidates/java/21.0.1-ms
@@ -32,7 +33,7 @@ ENV PATH=$PATH:$MAVEN_HOME/bin
 ENV ANDROID_HOME=/opt/androidsdk \
     FLUTTER_HOME=/opt/flutter
 
-RUN wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip \
+RUN wget https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip \
     && mkdir -p $ANDROID_HOME/cmdline-tools/latest \
     && unzip commandlinetools-linux-*.zip -d $ANDROID_HOME \
     && rm -f commandlinetools-linux-*.zip \
@@ -54,14 +55,13 @@ RUN git clone --branch ${FLUTTER_VERSION} https://github.com/flutter/flutter.git
     && ./bin/flutter precache \
     && ./bin/flutter doctor
 
-# install python3.10
+# install python 3.10
 RUN mkdir -p ~/.pip
 RUN echo '\n\
     [global] \n\
     trusted-host=mirrors.aliyun.com \n\
     index-url=https://mirrors.aliyun.com/pypi/simple/ \n\
     ' > ~/.pip/pip.conf
-
 # RUN apt-get update && apt-get install -y \
 #     software-properties-common
 
@@ -78,7 +78,26 @@ RUN curl http://fileshare.yoqi.me/d/DevFiles/Develop/Python/get-pip.py?sign=17C5
 RUN ln -s /usr/bin/python3.9 /usr/bin/python && \
     ln -s /usr/bin/pip3 /usr/bin/pip
 
-RUN rm -rf /var/lib/apt/lists/*
+
+# install R
+RUN apt-get update && apt-get install -y \
+    r-base r-base-dev 
+
+# install ruby
+# RUN apt-get update && apt-get install -y \
+#     ruby-full rubygems ruby-dev
+
+# install rust
+# RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+# install .net core 6.0
+# RUN wget https://packages.microsoft.com/config/ubuntu/21.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
+#     dpkg -i packages-microsoft-prod.deb && \
+#     rm packages-microsoft-prod.deb && \
+#     apt-get update && \
+#     apt-get install -y apt-transport-https && \
+#     apt-get update && \
+#     apt-get install -y dotnet-sdk-6.0
 
 # install go1.21
 RUN wget https://go.dev/dl/go1.21.4.linux-amd64.tar.gz && \
@@ -94,12 +113,12 @@ RUN npm config set ELECTRON_MIRROR https://npmmirror.com/mirrors/electron/ --glo
 RUN npm config set ELECTRON_BUILDER_BINARIES_MIRROR https://npmmirror.com/mirrors/electron-builder-binaries/ --global
 RUN npm install -g yarn pnpm
 
+RUN rm -rf /var/lib/apt/lists/*
 
 LABEL email="liuyuqi<liuyuqi.gov@msn.cn>"
 WORKDIR /workspaces
-# RUN mvn package
 
-RUN apt-get install -y wget unzip openssh-server
+RUN apt-get install -y openssh-server
 
 # 指定字符集支持命令行输入中文(根据需要选择字符集)
 ENV LANG C.UTF-8
@@ -115,13 +134,13 @@ RUN echo '\n\
     export GOPROXY="https://goproxy.io,direct" \n\
     ' >> ~/.bashrc
 
-
 # install vscode and extension
 RUN curl -fsSL https://code-server.dev/install.sh | sh &&\
     code-server --install-extension redhat.vscode-yaml &&\
     code-server --install-extension orta.vscode-jest &&\
     code-server --install-extension dbaeumer.vscode-eslint &&\
     code-server --install-extension ms-python.python &&\
+    code-server --install-extension ms-python.vscode-pylance &&\
     code-server --install-extension ms-azuretools.vscode-docker &&\
     code-server --install-extension mhutchie.git-graph &&\
     code-server --install-extension ardisaurus.gitflow-actions-sidebar &&\
@@ -129,8 +148,11 @@ RUN curl -fsSL https://code-server.dev/install.sh | sh &&\
     code-server --install-extension golang.go &&\
     code-server --install-extension Vue.volar &&\
     code-server --install-extension eamodio.gitlens &&\
+    code-server --install-extension REditorSupport.r &&\
     echo done
 
+# code-server --install-extension ms-dotnettools.csharp &&\
+
 VOLUME [ "/workspaces" ]
 
 CMD [ "/bin/bash" ]

+ 0 - 1
flutter/Dockerfile

@@ -1 +0,0 @@
-FROM sift-docker.pkg.coding.net/flutter-team/dev-container/dev-allinone:1.0.5-flutter