diff --git a/build.sh b/build.sh index b4ba6832..ab742609 100755 --- a/build.sh +++ b/build.sh @@ -2,13 +2,11 @@ function lint() { echo "Running linter..." - eslint cli/ --ext .js grep -rl '^#! */usr/bin/env node' cli/bin | xargs eslint } function lint_fix() { echo "Running linter with fix..." - eslint cli/ --ext .js --fix grep -rl '^#! */usr/bin/env node' cli/bin | xargs eslint --fix } diff --git a/cli/bin/compose b/cli/bin/compose index 98a463f0..f24cfb6a 100755 --- a/cli/bin/compose +++ b/cli/bin/compose @@ -9,7 +9,7 @@ function up() { _with_arguments 1 "$@" profile=${1}; shift prefix=${1:-${directory_name}}; shift - docker-compose -f "${VIQUEEN_DEVBOX_HOME}"/docker-compose/"${profile}".yml --project-name "${prefix}" up -d "$@" + docker compose -f "${VIQUEEN_DEVBOX_HOME}"/docker-compose/"${profile}".yml --project-name "${prefix}" up -d "$@" } # @COMMAND down [profile] tear down profile @@ -17,7 +17,7 @@ function down() { _with_arguments 1 "$@" profile=${1}; shift prefix=${1:-${directory_name}}; shift - docker-compose -f "${VIQUEEN_DEVBOX_HOME}"/docker-compose/"${profile}".yml --project-name "${prefix}" down "$@" + docker compose -f "${VIQUEEN_DEVBOX_HOME}"/docker-compose/"${profile}".yml --project-name "${prefix}" down "$@" } # @COMMAND stop [profile] stops profile @@ -25,7 +25,7 @@ function stop() { _with_arguments 1 "$@" profile=${1}; shift prefix=${1:-${directory_name}}; shift - docker-compose -f "${VIQUEEN_DEVBOX_HOME}"/docker-compose/"${profile}".yml --project-name "${prefix}" stop "$@" + docker compose -f "${VIQUEEN_DEVBOX_HOME}"/docker-compose/"${profile}".yml --project-name "${prefix}" stop "$@" } # @COMMAND profile [name] opens profile for edit diff --git a/cli/bin/image b/cli/bin/image index da0cd044..295fa52c 100755 --- a/cli/bin/image +++ b/cli/bin/image @@ -5,134 +5,6 @@ source selfedit.sh -DOCKER_IMAGES_HOME=${VIQUEEN_DEVBOX_HOME}/docker-images -DOCKER_HUB_NAMESPACE=${NAMESPACE:-viqueen} - -_image() { - _with_arguments 2 "$@" - name=${1} - version=${2} - if [[ ${DOCKER_HUB_NAMESPACE} == "/" ]]; then - namespace="" - else - namespace=${DOCKER_HUB_NAMESPACE}/ - fi - echo "${namespace}${name}:${version}" -} - -# @COMMAND build [name] [tag] builds a docker image in viqueen namespace -function build() { - image=$(_image "$@") - name=${1} - baseVersion=${2} - target=${DOCKER_IMAGES_HOME}/${name}/ - - if [[ -f "${target}/jdk.Dockerfile" ]]; then - sed "s/\${JDK_VERSION}/${baseVersion}/g" "${target}"/jdk.Dockerfile > "${target}"/Dockerfile - fi - if [[ -f "${target}/ubuntu.Dockerfile" ]]; then - sed "s/\${UBUNTU_VERSION}/${baseVersion}/g" "${target}"/ubuntu.Dockerfile > "${target}"/Dockerfile - fi - if [[ -f "${target}/node.Dockerfile" ]]; then - sed "s/\${NODE_VERSION}/${baseVersion}/g" "${target}"/node.Dockerfile > "${target}"/Dockerfile - fi - if [[ -f "${target}/confluence.Dockerfile" ]]; then - sed "s/\${CONFLUENCE_VERSION}/${baseVersion}/g" "${target}"/confluence.Dockerfile > "${target}"/Dockerfile - fi - if [[ -f "${target}/golang.Dockerfile" ]]; then - sed "s/\${GO_VERSION}/${baseVersion}/g" "${target}"/golang.Dockerfile > "${target}"/Dockerfile - fi - - shift - shift - - docker build -t "${image}" "${target}"/ "$@" -} - -# @COMMAND file [name] [tag] generates a docker file for a given image template -function file() { - image=$(_image "$@") - name=${1} - baseVersion=${2} - target=${DOCKER_IMAGES_HOME}/${name}/ - - if [[ -f "${target}/jdk.Dockerfile" ]]; then - sed "s/\${JDK_VERSION}/${baseVersion}/g" "${target}"/jdk.Dockerfile > "${target}"/Dockerfile - fi - if [[ -f "${target}/ubuntu.Dockerfile" ]]; then - sed "s/\${UBUNTU_VERSION}/${baseVersion}/g" "${target}"/ubuntu.Dockerfile > "${target}"/Dockerfile - fi - if [[ -f "${target}/node.Dockerfile" ]]; then - sed "s/\${NODE_VERSION}/${baseVersion}/g" "${target}"/node.Dockerfile > "${target}"/Dockerfile - fi - if [[ -f "${target}/confluence.Dockerfile" ]]; then - sed "s/\${CONFLUENCE_VERSION}/${baseVersion}/g" "${target}"/confluence.Dockerfile > "${target}"/Dockerfile - fi - if [[ -f "${target}/golang.Dockerfile" ]]; then - sed "s/\${GO_VERSION}/${baseVersion}/g" "${target}"/golang.Dockerfile > "${target}"/Dockerfile - fi -} - -# @COMMAND scan [name] [tag] scans a docker image in viqueen namespace -function scan() { - image=$(_image "$@") - docker scan "${image}" -} - -# @COMMAND push [name] [tag] pushes a docker image to viqueen namespace on docker hub -function push() { - image=$(_image "$@") - shift - shift - docker push "${image}" "$@" -} - -_run_cmd() { - _with_arguments 2 "$@" - image=$(_image "${1}" "${2}") - shift - shift - if [[ -n ${1} ]]; then - options="--name ${1}" - shift - fi - # shellcheck disable=SC2145 - echo "docker run ${options} $@ -it --entrypoint=/bin/bash ${image}" -} - -# @COMMAND run [name] [tag] runs a docker image from viqueen namespace -function run() { - cmd=$(_run_cmd "$@") - echo -e "${GREEN}Execute ${cmd}${COLOR_OFF}" - eval "${cmd}" -} - -_mount_cmd() { - _with_arguments 2 "$@" - directory=$(pwd) - volume_name=$(basename "${directory}") - image=$(_image "${1}" "${2}") - shift - shift - options="--name ${volume_name} --volume ${directory}:/sources/${volume_name}" - # shellcheck disable=SC2145 - echo "docker run ${options} -it --entrypoint=/bin/bash -w=/sources/${volume_name} $@ ${image}" -} - -# @COMMAND mount [name] [tag] mounts current working directory as volume onto image -function mount() { - cmd=$(_mount_cmd "$@") - echo -e "${GREEN}Execute ${cmd}${COLOR_OFF}" - eval "${cmd}" -} - -# @COMMAND dismount cleans up current working directory as volume -function dismount() { - directory=$(pwd) - volume_name=$(basename "${directory}") - docker rm "${volume_name}" -} - _start_cmd() { _with_arguments 1 "$@" container=${1} @@ -161,9 +33,6 @@ function cmd() { "start") _start_cmd "$@" ;; - "mount") - _mount_cmd "$@" - ;; "run") _run_cmd "$@" ;; @@ -194,11 +63,6 @@ function stop() { docker ps -a | tail -n +2 | awk '{ print $1 }' | xargs docker stop } -# @COMMAND list -function list() { - ls -lrt "${DOCKER_IMAGES_HOME}" -} - # shellcheck disable=SC2068 eval $@ diff --git a/docker-compose/amazon.yml b/docker-compose/amazon.yml deleted file mode 100644 index a875da3e..00000000 --- a/docker-compose/amazon.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: "3.8" -services: - postgres: - image: postgres:10.1 - restart: always - ports: - - "5432:5432" - environment: - POSTGRES_DB: confluence - POSTGRES_USER: confluence - POSTGRES_PASSWORD: confluence - amazon: - image: amazonlinux:2 - privileged: true - stdin_open: true - tty: true - volumes: - - ${PWD}:/sources - ports: - - "8090:8090" - links: - - "postgres" diff --git a/docker-compose/graphdb.yml b/docker-compose/graphdb.yml deleted file mode 100644 index f8587350..00000000 --- a/docker-compose/graphdb.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: "3.8" -services: - graphdb: - image: "neo4j:enterprise" - network_mode: bridge - ports: - - "7474:7474" - - "7687:7687" - environment: - - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes - volumes: - - ../.neo4j/data:/data diff --git a/docker-compose/greenmail.yml b/docker-compose/greenmail.yml deleted file mode 100644 index a1e0a03c..00000000 --- a/docker-compose/greenmail.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: "3.8" -services: - greenmail: - image: greenmail/standalone:1.6.11 - restart: always - ports: - - "3025:3025" # SMTP - - "3110:3110" # POP3 - - "3143:3143" # IMAP - - "3465:3465" # SMTPS - - "3993:3993" # IMAPS - - "3995:3995" # POP3S - environment: - GREENMAIL_OPTS: "-Dgreenmail.setup.test.all - -Dgreenmail.hostname=0.0.0.0 - -Dgreenmail.verbose - -Dgreenmail.users=pyn:pyn@local.dev" - JAVA_OPTS: "-Djava.net.preferIPv4Stack=true -Xmx512m" diff --git a/docker-compose/javazone-2022.yml b/docker-compose/javazone-2022.yml deleted file mode 100644 index acb33dff..00000000 --- a/docker-compose/javazone-2022.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: "3.9" -services: - javazone: - image: viqueen/javazone-2022:workshop - entrypoint: /bin/bash - stdin_open: true - tty: true - volumes: - - ~/sources/viqueen/jdk:/sources/jdk - - ~/sources/viqueen/javazone-2022:/sources/javazone-2022 diff --git a/docker-compose/localstack.yml b/docker-compose/localstack.yml deleted file mode 100644 index cf70b554..00000000 --- a/docker-compose/localstack.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: "3.8" -services: - localstack: - image: "localstack/localstack:0.13.3" - container_name: localstack_service - network_mode: bridge - ports: - - "4566:4566" - environment: - - DISABLE_CORS_CHECKS=1 - - DISABLE_CUSTOM_CORS_S3=1 - - EXTRA_CORS_ALLOWED_HEADERS=X-Requested-With - - SERVICES=s3 - - DATA_DIR=/tmp/localstack/data - - DOCKER_HOST=unix:///var/run/docker.sock - - DEBUG=1 - volumes: - - ../.localstack:/tmp/localstack - - /var/run/docker.sock:/var/run/docker.sock diff --git a/docker-compose/mailhog.yml b/docker-compose/mailhog.yml deleted file mode 100644 index e2676789..00000000 --- a/docker-compose/mailhog.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: "3.8" -services: - mail: - image: mailhog/mailhog - ports: - - "1025:1025" - - "8025:8025" diff --git a/docker-compose/mysql.yml b/docker-compose/mysql.yml deleted file mode 100644 index 1ee35f68..00000000 --- a/docker-compose/mysql.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: "3.8" -services: - mysql: - image: mysql:8.0 - restart: always - ports: - - "3306:3306" - command: --character-set-server=utf8 --collation-server=utf8_bin --transaction-isolation=READ-COMMITTED - environment: - MYSQL_ROOT_PASSWORD: devbox - MYSQL_DATABASE: devbox - MYSQL_USER: root - MYSQL_PASSWORD: devbox diff --git a/docker-compose/opensearch-dasho.yml b/docker-compose/opensearch-dasho.yml deleted file mode 100644 index 53d2962a..00000000 --- a/docker-compose/opensearch-dasho.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: "3.9" -services: - opensearch-dashboards: - image: opensearchproject/opensearch-dashboards:1.1.0 - environment: - OPENSEARCH_HOSTS: '["https://host.docker.internal:9201"]' - ports: - - "5601:5601" diff --git a/docker-compose/oracledb.yml b/docker-compose/oracledb.yml deleted file mode 100644 index 1a21ce20..00000000 --- a/docker-compose/oracledb.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: "3.8" -services: - oracledb: - image: ${ORACLE_DB_IMAGE}:19.3.0-se2-1.2.0-warm-1.1.1 - restart: always - ports: - - "1521:1521" - - "5500:5500" - environment: - ORACLE_SID: ORCLCDB - ORACLE_PDB: JIRADB - ORACLE_PWD: oracle - ORACLE_CHARACTERSET: AL32UTF8 diff --git a/docker-compose/paperless.yml b/docker-compose/paperless.yml deleted file mode 100644 index 6d171ddb..00000000 --- a/docker-compose/paperless.yml +++ /dev/null @@ -1,39 +0,0 @@ -services: - broker: - image: docker.io/library/redis:7 - restart: unless-stopped - volumes: - - redisdata:/data - - db: - image: docker.io/library/postgres:17 - restart: unless-stopped - volumes: - - pgdata:/var/lib/postgresql/data - environment: - POSTGRES_DB: paperless - POSTGRES_USER: paperless - POSTGRES_PASSWORD: paperless - - webserver: - image: ghcr.io/paperless-ngx/paperless-ngx:latest - restart: unless-stopped - depends_on: - - db - - broker - ports: - - "8000:8000" - volumes: - - data:/usr/src/paperless/data - - media:/usr/src/paperless/media - - ./export:/usr/src/paperless/export - - ./consume:/usr/src/paperless/consume - environment: - PAPERLESS_REDIS: redis://broker:6379 - PAPERLESS_DBHOST: db - -volumes: - data: - media: - pgdata: - redisdata: diff --git a/docker-compose/postgres.yml b/docker-compose/postgres.yml deleted file mode 100644 index d6941927..00000000 --- a/docker-compose/postgres.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: "3.8" -services: - postgres: - image: postgres:11.0 - restart: always - ports: - - "5432:5432" - environment: - POSTGRES_DB: devbox - POSTGRES_USER: devbox - POSTGRES_PASSWORD: devbox diff --git a/docker-compose/sftp-server.yml b/docker-compose/sftp-server.yml deleted file mode 100644 index 6f175b24..00000000 --- a/docker-compose/sftp-server.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: "3.8" -services: - sftp: - image: atmoz/sftp - ports: - - "2222:22" - volumes: - - ../.sftp:/home/foo/upload - command: foo:pass:1001 diff --git a/docker-compose/spicedb.yml b/docker-compose/spicedb.yml deleted file mode 100644 index a2770c96..00000000 --- a/docker-compose/spicedb.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: "3.8" -services: - playground: - image: ghcr.io/authzed/spicedb-playground:latest - ports: - - "3000:3000" - authzed: - image: authzed/spicedb:v1.35.0 - ports: - - "50051:50051" - command: ["serve-testing"] diff --git a/docker-compose/sqlserver-2017.yml b/docker-compose/sqlserver-2017.yml deleted file mode 100644 index 4f54e42a..00000000 --- a/docker-compose/sqlserver-2017.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: "3.8" -services: - sqlserver: - image: mcr.microsoft.com/mssql/server:2017-latest - restart: always - ports: - - "1433:1433" - environment: - SA_PASSWORD: Devbox123! - ACCEPT_EULA: Y - MSSQL_COLLATION: "SQL_Latin1_General_CP1_CS_AS" - READ_COMMITTED_SNAPSHOT: "ON" - command: > - /bin/sh -c "(/opt/mssql/bin/sqlservr &) - && sleep 10s && /opt/mssql-tools/bin/sqlcmd - -S localhost -U sa -P Devbox123! - -d master - -Q 'CREATE DATABASE [devbox]; ALTER DATABASE [devbox] SET READ_COMMITTED_SNAPSHOT ON WITH ROLLBACK IMMEDIATE;' - && sleep infinity" diff --git a/docker-compose/sqlserver.yml b/docker-compose/sqlserver.yml deleted file mode 100644 index 1ca79e16..00000000 --- a/docker-compose/sqlserver.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: "3.8" -services: - sqlserver: - image: mcr.microsoft.com/mssql/server:2019-latest - restart: always - ports: - - "1433:1433" - environment: - SA_PASSWORD: Devbox123! - ACCEPT_EULA: Y - MSSQL_COLLATION: "SQL_Latin1_General_CP1_CS_AS" - READ_COMMITTED_SNAPSHOT: "ON" - command: > - /bin/sh -c "(/opt/mssql/bin/sqlservr &) - && sleep 10s && /opt/mssql-tools/bin/sqlcmd - -S localhost -U sa -P Devbox123! - -d master - -Q 'CREATE DATABASE [devbox]; ALTER DATABASE [devbox] SET READ_COMMITTED_SNAPSHOT ON WITH ROLLBACK IMMEDIATE;' - && sleep infinity" diff --git a/docker-compose/ubuntu.yml b/docker-compose/ubuntu.yml deleted file mode 100644 index 33ad9d8d..00000000 --- a/docker-compose/ubuntu.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: "3.8" -services: - postgres: - image: postgres:10.1 - restart: always - ports: - - "5432:5432" - environment: - POSTGRES_DB: confluence - POSTGRES_USER: confluence - POSTGRES_PASSWORD: confluence - confluence: - image: ubuntu:18.04 - privileged: true - stdin_open: true - tty: true - volumes: - - ${PWD}:/sources - ports: - - "8090:8090" - links: - - "postgres" diff --git a/docker-images/atlaseco/jdk.Dockerfile b/docker-images/atlaseco/jdk.Dockerfile deleted file mode 100644 index c9dba152..00000000 --- a/docker-images/atlaseco/jdk.Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM openjdk:${JDK_VERSION} - -ARG MAVEN_VERSION=3.6.3 - -RUN apt-get update \ - && apt-get install -y curl unzip wget \ - && apt-get clean - -# maven -RUN mkdir -p /usr/local/bin \ - && curl -s https://bitbucket.org/mjensen/mvnvm/raw/master/mvn > /usr/local/bin/mvn \ - && chmod 0755 /usr/local/bin/mvn \ - && echo "mvn_version=$MAVEN_VERSION" > mvnvm.properties \ - && mvn --version \ - && rm mvnvm.properties - -# atlassian sdk -RUN mkdir -p /tmp/downloads \ - && cd /tmp/downloads \ - && wget -O atlassian-plugin-sdk.tar.gz https://marketplace.atlassian.com/download/plugins/atlassian-plugin-sdk-tgz \ - && mkdir -p /opt/atlassian-plugin-sdk \ - && cd /opt/atlassian-plugin-sdk \ - && tar -xvf /tmp/downloads/atlassian-plugin-sdk.tar.gz --strip 1 \ - && rm -rf /tmp/downloads - -ENV PATH=${PATH}:/opt/atlassian-plugin-sdk/bin -ENV ATLAS_MVN=/usr/local/bin/mvn \ No newline at end of file diff --git a/docker-images/atlassian-devbox-confluence/confluence.Dockerfile b/docker-images/atlassian-devbox-confluence/confluence.Dockerfile deleted file mode 100644 index af33ddd3..00000000 --- a/docker-images/atlassian-devbox-confluence/confluence.Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM maven:3.9.1-eclipse-temurin-11 - -RUN apt update \ - && wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash \ - && . ~/.bashrc \ - && nvm install 18.16.0 \ - && apt clean - -RUN . ~/.bashrc \ - && npm install atlassian-devbox -g \ - && confluence install ${CONFLUENCE_VERSION} \ No newline at end of file diff --git a/docker-images/golang/golang.Dockerfile b/docker-images/golang/golang.Dockerfile deleted file mode 100644 index 58ab30bb..00000000 --- a/docker-images/golang/golang.Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM golang:${GO_VERSION} - -RUN apt-get update \ - && apt-get install -y git vim \ - && apt-get clean - -# devbox, I still want my vim and prompts configured -RUN mkdir -p ~/sources \ - && git clone --recursive https://github.com/viqueen/devbox.git ~/sources/devbox \ - && cd ~/sources/devbox \ - && ./setup.sh config_box \ - && ./setup.sh config_prompt \ - && ./setup.sh config_vim diff --git a/docker-images/javazone-2022/jdk.Dockerfile b/docker-images/javazone-2022/jdk.Dockerfile deleted file mode 100644 index ef169939..00000000 --- a/docker-images/javazone-2022/jdk.Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM maven:3.8.6-openjdk-18-slim - -RUN apt-get update \ - && apt-get install -y file autoconf make unzip zip build-essential \ - && apt-get install -y libasound2-dev libcups2-dev libfontconfig1-dev libx11-dev libxext-dev \ - && apt-get install -y libxrender-dev libxrandr-dev libxtst-dev libxt-dev \ - && apt-get clean - - -RUN apt-get install -y git ant \ - && echo 'export ANT_HOME=/usr/share/ant' >> ~/.bashrc \ - && git clone https://github.com/jenv/jenv.git ~/.jenv \ - && echo 'export PATH="${HOME}/.jenv/bin:${PATH}"' >> ~/.bashrc \ - && echo 'eval "$(jenv init -)"' >> ~/.bashrc \ - && apt-get clean diff --git a/docker-images/maven-java/jdk.Dockerfile b/docker-images/maven-java/jdk.Dockerfile deleted file mode 100644 index ad585b81..00000000 --- a/docker-images/maven-java/jdk.Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM maven:${JDK_VERSION} - -RUN apt-get update \ - && apt-get install -y git wget \ - && wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash \ - && . ~/.bashrc \ - && nvm install 17.8.0 \ - && apt-get clean diff --git a/docker-images/mesh/jdk.Dockerfile b/docker-images/mesh/jdk.Dockerfile deleted file mode 100644 index 0c9c2f16..00000000 --- a/docker-images/mesh/jdk.Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM openjdk:${JDK_VERSION} - -ARG MAVEN_VERSION=3.6.3 -ARG NODE_VERSION=v12.16.2 - -RUN apk add curl wget bash nodejs nodejs-npm \ - && apk cache clean - -SHELL ["/bin/bash", "-c"] - -# maven -RUN mkdir -p /usr/local/bin \ - && curl -s https://bitbucket.org/mjensen/mvnvm/raw/master/mvn > /usr/local/bin/mvn \ - && chmod 0755 /usr/local/bin/mvn \ - && echo "mvn_version=$MAVEN_VERSION" > mvnvm.properties \ - && mvn --version \ - && rm mvnvm.properties \ No newline at end of file diff --git a/docker-images/mosman/jdk.Dockerfile b/docker-images/mosman/jdk.Dockerfile deleted file mode 100644 index 3c34fb68..00000000 --- a/docker-images/mosman/jdk.Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM openjdk:${JDK_VERSION} - -ARG MAVEN_VERSION=3.6.3 -ARG NODE_VERSION=v12.16.2 - -RUN apt-get update \ - && apt-get install -y curl unzip wget nodejs npm git \ - && apt-get clean - -SHELL ["/bin/bash", "-c"] - -# maven -RUN mkdir -p /usr/local/bin \ - && curl -s https://bitbucket.org/mjensen/mvnvm/raw/master/mvn > /usr/local/bin/mvn \ - && chmod 0755 /usr/local/bin/mvn \ - && echo "mvn_version=$MAVEN_VERSION" > mvnvm.properties \ - && mvn --version \ - && rm mvnvm.properties - -# NVM -RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | bash diff --git a/docker-images/nodejs/node.Dockerfile b/docker-images/nodejs/node.Dockerfile deleted file mode 100644 index fac1bf2c..00000000 --- a/docker-images/nodejs/node.Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM node:${NODE_VERSION} - -RUN apt-get update \ - && apt-get install -y git vim \ - && apt-get clean - -# devbox, I still want my vim and prompts configured - -RUN mkdir -p ~/sources \ - && git clone --recursive https://github.com/viqueen/devbox.git ~/sources/devbox \ - && cd ~/sources/devbox \ - && ./setup.sh config_box \ - && ./setup.sh config_prompt \ - && ./setup.sh config_vim diff --git a/docker-images/openjdk-6/ubuntu.Dockerfile b/docker-images/openjdk-6/ubuntu.Dockerfile deleted file mode 100644 index ba14caeb..00000000 --- a/docker-images/openjdk-6/ubuntu.Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM ubuntu:${UBUNTU_VERSION} - -LABEL org.opencontainers.image.authors="viqueen" - -# https://openjdk.java.net/install/#jdk6_ubuntu -RUN apt-get update \ - && apt-get install -y openjdk-6-jdk \ - && apt-get clean - -RUN apt-get install -y maven ant vim \ - && apt-get clean \ No newline at end of file diff --git a/docker-images/openjdk-workshop/jdk.Dockerfile b/docker-images/openjdk-workshop/jdk.Dockerfile deleted file mode 100644 index c35cdf84..00000000 --- a/docker-images/openjdk-workshop/jdk.Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM maven:3.9-eclipse-temurin-20 - -RUN apt-get update \ - && apt-get install -y file autoconf make unzip zip build-essential \ - && apt-get install -y libasound2-dev libcups2-dev libfontconfig1-dev libx11-dev libxext-dev \ - && apt-get install -y libxrender-dev libxrandr-dev libxtst-dev libxt-dev \ - && apt-get clean - - -RUN apt-get install -y git ant \ - && apt-get clean \ - && echo 'export ANT_HOME=/usr/share/ant' >> ~/.bashrc \ - && git clone https://github.com/jenv/jenv.git ~/.jenv \ - && echo 'export PATH="${HOME}/.jenv/bin:${PATH}"' >> ~/.bashrc \ - && echo 'eval "$(jenv init -)"' >> ~/.bashrc diff --git a/docker-images/protobuf-gen/node.Dockerfile b/docker-images/protobuf-gen/node.Dockerfile deleted file mode 100644 index 13e45fb2..00000000 --- a/docker-images/protobuf-gen/node.Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM node:${NODE_VERSION} - -# Install buf \ -RUN npm install --ignore-scripts -g @bufbuild/buf@1.31.0 - -# Install protoct-gen-ts -RUN npm install --ignore-scripts -g protoc-gen-ts@0.8.7 - - -WORKDIR /workspace/schema \ No newline at end of file diff --git a/docker-images/teknologi/node.Dockerfile b/docker-images/teknologi/node.Dockerfile deleted file mode 100644 index 2c8fa8d6..00000000 --- a/docker-images/teknologi/node.Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM node:${NODE_VERSION} - -ARG NVM_VERSION=v0.39.1 - -RUN apt-get update \ - && apt-get install -y git vim curl unzip wget ruby \ - && apt-get clean - -# NVM -RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh | bash - -# devbox -RUN mkdir -p ~/sources \ - && git clone --recursive https://github.com/viqueen/devbox.git ~/sources/devbox \ - && cd ~/sources/devbox \ - && ./setup.sh config_box \ - && ./setup.sh config_prompt \ - && ./setup.sh config_vim diff --git a/docker-images/ubuntu/ubuntu.Dockerfile b/docker-images/ubuntu/ubuntu.Dockerfile deleted file mode 100644 index 6c388b72..00000000 --- a/docker-images/ubuntu/ubuntu.Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM ubuntu:${UBUNTU_VERSION} - -LABEL org.opencontainers.image.authors="viqueen" - -RUN apt-get update \ - && apt-get install -y git vim curl \ - && apt-get clean - -# nvm -RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash - -# devbox, I still want my vim and prompts configured - -RUN mkdir -p ~/sources \ - && git clone --recursive https://github.com/viqueen/devbox.git ~/sources/devbox \ - && cd ~/sources/devbox \ - && ./setup.sh config_box \ - && ./setup.sh config_prompt \ - && ./setup.sh config_vim