updated .devcontainer environment

updated npm packages
made vue compile again
This commit is contained in:
2021-05-08 12:29:59 +00:00
parent 0deaf7260f
commit 92ab88eca7
6 changed files with 3120 additions and 2848 deletions
+21 -53
View File
@@ -1,58 +1,26 @@
#------------------------------------------------------------------------------------------------------------- # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.177.0/containers/java/.devcontainer/base.Dockerfile
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------
FROM openjdk:11-jdk # [Choice] Java version: 11, 15
ARG VARIANT="15"
FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT}
# This Dockerfile adds a non-root user with sudo access. Use the "remoteUser" # [Option] Install Maven
# property in devcontainer.json to use it. On Linux, the container user's GID/UIDs ARG INSTALL_MAVEN="false"
# will be updated to match your local UID/GID (when using the dockerFile property). ARG MAVEN_VERSION=""
# See https://aka.ms/vscode-remote/containers/non-root-user for details. # [Option] Install Gradle
ARG USERNAME=vscode ARG INSTALL_GRADLE="false"
ARG USER_UID=1000 ARG GRADLE_VERSION=""
ARG USER_GID=$USER_UID RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
&& if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
# Options for common package install script # [Option] Install Node.js
ARG INSTALL_ZSH="true" ARG INSTALL_NODE="true"
ARG UPGRADE_PACKAGES="true" ARG NODE_VERSION="lts/*"
ARG COMMON_SCRIPT_SOURCE="https://raw.githubusercontent.com/microsoft/vscode-dev-containers/v0.128.0/script-library/common-debian.sh" RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
ARG COMMON_SCRIPT_SHA="a6bfacc5c9c6c3706adc8788bf70182729767955b7a5509598ac205ce6847e1e"
# Configure apt # [Optional] Uncomment this section to install additional OS packages.
RUN apt-get update \ # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& export DEBIAN_FRONTEND=noninteractive \ # && apt-get -y install --no-install-recommends <your-package-list-here>
#
# Install node and npm
&& apt-get -y install --no-install-recommends nodejs npm 2>&1 \
#
# Verify git, common tools / libs installed, add/modify non-root user, optionally install zsh
&& apt-get -y install --no-install-recommends curl ca-certificates 2>&1 \
&& curl -sSL ${COMMON_SCRIPT_SOURCE} -o /tmp/common-setup.sh \
&& ([ "${COMMON_SCRIPT_SHA}" = "dev-mode" ] || (echo "${COMMON_SCRIPT_SHA} */tmp/common-setup.sh" | sha256sum -c -)) \
&& /bin/bash /tmp/common-setup.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
&& rm /tmp/common-setup.sh
#-------------------Uncomment the following steps to install Maven CLI Tools---------------------------------- # [Optional] Uncomment this line to install global node packages.
# ARG MAVEN_VERSION=3.6.3 # RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
# ARG MAVEN_SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
# RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
# && export DEBIAN_FRONTEND=noninteractive \
# && curl -fsSL -o /tmp/apache-maven.tar.gz https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
# && echo "${MAVEN_SHA} /tmp/apache-maven.tar.gz" | sha512sum -c - \
# && tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 \
# && rm -f /tmp/apache-maven.tar.gz \
# && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
# COPY maven-settings.xml /usr/share/maven/ref/
# ENV MAVEN_HOME /usr/share/maven
# ENV MAVEN_CONFIG /root/.m2
#-------------------------------------------------------------------------------------------------------------
# Clean up
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get autoremove -y \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*
# Allow for a consistant java home location for settings - image is changing over time
RUN if [ ! -d "/docker-java-home" ]; then ln -s "${JAVA_HOME}" /docker-java-home; fi
+1 -1
View File
@@ -9,7 +9,7 @@
// Set *default* container specific settings.json values on container create. // Set *default* container specific settings.json values on container create.
"settings": { "settings": {
"terminal.integrated.shell.linux": "/bin/bash", "terminal.integrated.defaultProfile.linux": "/bin/bash",
"java.home": "/docker-java-home" "java.home": "/docker-java-home"
}, },
+6
View File
@@ -6,6 +6,12 @@ services:
build: build:
context: . context: .
dockerfile: .devcontainer/Dockerfile dockerfile: .devcontainer/Dockerfile
args:
VARIANT: "11"
INSTALL_MAVEN: "false"
INSTALL_GRADLE: "false"
INSTALL_NODE: "true"
NODE_VERSION: "lts/*"
volumes: volumes:
- ./:/workspace:cached - ./:/workspace:cached
- ~/.m2:/home/vscode/.m2:cached - ~/.m2:/home/vscode/.m2:cached
+3083 -2784
View File
File diff suppressed because it is too large Load Diff
+8 -8
View File
@@ -8,22 +8,22 @@
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
"dependencies": { "dependencies": {
"bulma": "^0.9.0", "bulma": "^0.9.2",
"core-js": "^3.6.5", "core-js": "^3.12.0",
"vue": "^2.6.11", "vue": "^2.6.12",
"vue-router": "^3.3.4" "vue-router": "^3.5.1"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "~4.4.0", "@vue/cli-plugin-babel": "~4.4.0",
"@vue/cli-plugin-eslint": "~4.4.0", "@vue/cli-plugin-eslint": "~4.4.0",
"@vue/cli-plugin-router": "^4.4.6", "@vue/cli-plugin-router": "^4.5.13",
"@vue/cli-service": "~4.4.0", "@vue/cli-service": "^4.5.13",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"eslint": "^6.7.2", "eslint": "^6.7.2",
"eslint-plugin-vue": "^6.2.2", "eslint-plugin-vue": "^6.2.2",
"node-sass": "^4.14.1", "node-sass": "^4.14.1",
"sass-loader": "^9.0.2", "sass-loader": "^9.0.3",
"vue-template-compiler": "^2.6.11" "vue-template-compiler": "^2.6.12"
}, },
"eslintConfig": { "eslintConfig": {
"root": true, "root": true,
-1
View File
@@ -18,7 +18,6 @@ export default {
}, },
props: { props: {
channel: String, channel: String,
active: Boolean,
}, },
}; };
</script> </script>