diff --git a/java/.gitlab-ci.yml b/java/.gitlab-ci.yml index 234d8bc..22c61f5 100644 --- a/java/.gitlab-ci.yml +++ b/java/.gitlab-ci.yml @@ -11,16 +11,6 @@ - Dockerfile.base - if: '$CI_PIPELINE_SOURCE == "schedule"' -build_java8: - <<: *build_template - variables: - JAVA_VERSION: "8" - -build_java17: - <<: *build_template - variables: - JAVA_VERSION: "17" - build_java21: <<: *build_template variables: diff --git a/java/Dockerfile.java17 b/java/Dockerfile.java17 deleted file mode 100644 index 0aff76c..0000000 --- a/java/Dockerfile.java17 +++ /dev/null @@ -1,15 +0,0 @@ -FROM registry.bobert.me/anthorob/coder-images:base@sha256:0338f8b6fd1be44a5b85182a6c652362ccb5b43776ce5c7d1ccd205402765305 - -USER root - -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - openjdk-17-jdk \ - maven \ - && apt-get clean && rm -rf /var/lib/apt/lists/* - -ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -USER coder -WORKDIR /home/coder \ No newline at end of file diff --git a/java/Dockerfile.java8 b/java/Dockerfile.java8 deleted file mode 100644 index afe8966..0000000 --- a/java/Dockerfile.java8 +++ /dev/null @@ -1,15 +0,0 @@ -FROM registry.bobert.me/anthorob/coder-images:base@sha256:0338f8b6fd1be44a5b85182a6c652362ccb5b43776ce5c7d1ccd205402765305 - -USER root - -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - openjdk-8-jdk \ - maven \ - && apt-get clean && rm -rf /var/lib/apt/lists/* - -ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 -ENV PATH="${JAVA_HOME}/bin:${PATH}" - -USER coder -WORKDIR /home/coder \ No newline at end of file diff --git a/php/.gitlab-ci.yml b/php/.gitlab-ci.yml index 893729a..2fdfe0c 100644 --- a/php/.gitlab-ci.yml +++ b/php/.gitlab-ci.yml @@ -14,14 +14,4 @@ build_php82: <<: *build_template variables: - PHP_VERSION: "82" - -build_php80: - <<: *build_template - variables: - PHP_VERSION: "80" - -build_php74: - <<: *build_template - variables: - PHP_VERSION: "74" \ No newline at end of file + PHP_VERSION: "82" \ No newline at end of file diff --git a/php/Dockerfile.php74 b/php/Dockerfile.php74 deleted file mode 100644 index d063a15..0000000 --- a/php/Dockerfile.php74 +++ /dev/null @@ -1,41 +0,0 @@ -FROM registry.bobert.me/anthorob/coder-images:base@sha256:0338f8b6fd1be44a5b85182a6c652362ccb5b43776ce5c7d1ccd205402765305 - -USER root - -RUN apt-get update && \ - add-apt-repository ppa:ondrej/php && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - php7.4 \ - php7.4-cli \ - php7.4-common \ - php7.4-curl \ - php7.4-mbstring \ - php7.4-mysql \ - php7.4-xml \ - php7.4-zip \ - php7.4-bcmath \ - php7.4-soap \ - php7.4-readline \ - php7.4-intl \ - php7.4-opcache \ - php7.4-gd \ - php7.4-pgsql \ - php7.4-sqlite3 \ - php7.4-tokenizer \ - php7.4-fileinfo && \ - apt-get clean && rm -rf /var/lib/apt/lists/* - -RUN update-alternatives --install /usr/bin/php php /usr/bin/php7.4 74 && \ - update-alternatives --set php /usr/bin/php7.4 - -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer - -USER coder - -ENV NVM_DIR=/home/coder/.nvm -RUN mkdir -p $NVM_DIR && \ - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash - - -WORKDIR /home/coder \ No newline at end of file diff --git a/php/Dockerfile.php80 b/php/Dockerfile.php80 deleted file mode 100644 index ad9502b..0000000 --- a/php/Dockerfile.php80 +++ /dev/null @@ -1,41 +0,0 @@ -FROM registry.bobert.me/anthorob/coder-images:base@sha256:0338f8b6fd1be44a5b85182a6c652362ccb5b43776ce5c7d1ccd205402765305 - -USER root - -RUN apt-get update && \ - add-apt-repository ppa:ondrej/php && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - php8.0 \ - php8.0-cli \ - php8.0-common \ - php8.0-curl \ - php8.0-mbstring \ - php8.0-mysql \ - php8.0-xml \ - php8.0-zip \ - php8.0-bcmath \ - php8.0-soap \ - php8.0-readline \ - php8.0-intl \ - php8.0-opcache \ - php8.0-gd \ - php8.0-pgsql \ - php8.0-sqlite3 \ - php8.0-tokenizer \ - php8.0-fileinfo && \ - apt-get clean && rm -rf /var/lib/apt/lists/* - -RUN update-alternatives --install /usr/bin/php php /usr/bin/php8.0 80 && \ - update-alternatives --set php /usr/bin/php8.0 - -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer - -USER coder - -ENV NVM_DIR=/home/coder/.nvm -RUN mkdir -p $NVM_DIR && \ - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash - - -WORKDIR /home/coder \ No newline at end of file