Compare commits

...

7 Commits

Author SHA1 Message Date
amorozov a8429cced6 updated Dockerfile
Gitea/docker-base-images/jdk14-alpine/pipeline/head This commit looks good Details
2024-06-16 22:40:06 +03:00
amorozov a3a94fcf4e updated Dockerfile
Gitea/docker-base-images/jdk14-alpine/pipeline/head This commit looks good Details
2024-06-16 22:36:26 +03:00
amorozov 28a1b616a8 updated Dockerfile
Gitea/docker-base-images/jdk14-alpine/pipeline/head There was a failure building this commit Details
2024-06-16 22:33:41 +03:00
amorozov 71ab7fbae0 feature: added docker buildx
Gitea/docker-base-images/jdk14-alpine/pipeline/head There was a failure building this commit Details
2024-06-16 22:21:40 +03:00
amorozov 0d1e8df801 feature: changed openssh dependency to openssh-client
Gitea/docker-base-images/jdk14-alpine/pipeline/head This commit looks good Details
2023-04-04 20:29:43 +03:00
amorozov 83e4df3b6d feature: added openssh installation
Gitea/docker-base-images/jdk14-alpine/pipeline/head This commit looks good Details
2023-04-04 20:28:29 +03:00
amorozov d1489e801f chore: changed agent base image to own alpine-base
Gitea/docker-base-images/jdk14-alpine/pipeline/head This commit looks good Details
2023-04-04 20:22:01 +03:00
2 changed files with 8 additions and 10 deletions

View File

@ -6,16 +6,14 @@ FROM ${BASE_IMAGE}
ENV GROOVY_HOME=/opt/groovy ENV GROOVY_HOME=/opt/groovy
ENV GROOVY_VERSION=4.0.9 ENV GROOVY_VERSION=4.0.9
ENV DOCKER_COMPOSE_VERSION 1.23.2
# Install docker-cli, docker-compose, git, bash # Install docker-cli, docker-compose, git, bash
RUN apk update && \ RUN apk update && \
apk add --no-cache docker-cli python3 py3-pip git bash && \ apk add --no-cache docker-cli bash git
apk add --no-cache --virtual .docker-compose-deps python3-dev libffi-dev openssl-dev gcc libc-dev make && \
# ln -s /usr/bin/pip3 /usr/bin/pip && \
ln -s /usr/bin/python3 /usr/bin/python && \
pip install --upgrade pip && \
pip3 install docker-compose && \
apk del .docker-compose-deps
RUN apk --update add py-pip &&\
pip install -U docker-compose==${DOCKER_COMPOSE_VERSION}
RUN set -o errexit -o nounset && echo "Installing build dependencies" && \ RUN set -o errexit -o nounset && echo "Installing build dependencies" && \
apk add --no-cache --virtual .build-deps gnupg && \ apk add --no-cache --virtual .build-deps gnupg && \
@ -44,5 +42,6 @@ RUN set -o errexit -o nounset && echo "Installing build dependencies" && \
echo "Editing startGroovy to include java.xml.bind module" && \ echo "Editing startGroovy to include java.xml.bind module" && \
sed --in-place 's|startGroovy ( ) {|startGroovy ( ) {\n JAVA_OPTS="$JAVA_OPTS --add-modules=ALL-SYSTEM"|' "${GROOVY_HOME}/bin/startGroovy" sed --in-place 's|startGroovy ( ) {|startGroovy ( ) {\n JAVA_OPTS="$JAVA_OPTS --add-modules=ALL-SYSTEM"|' "${GROOVY_HOME}/bin/startGroovy"
RUN apk --no-cache add openssh RUN apk add --no-cache openssh-client
COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx

3
Jenkinsfile vendored
View File

@ -9,7 +9,7 @@ def resolveImageName(env) {
pipeline { pipeline {
agent { agent {
docker { docker {
image 'alpine:3.17.3' image 'git.tswf.io/docker-base-images/alpine-base:1.0.0-3.17.3'
// Mount docker socket for docker-in-docker // Mount docker socket for docker-in-docker
args '-v /var/run/docker.sock:/var/run/docker.sock' args '-v /var/run/docker.sock:/var/run/docker.sock'
} }
@ -17,7 +17,6 @@ pipeline {
stages { stages {
stage('prepare') { stage('prepare') {
steps { steps {
sh "apk update && apk add --no-cache git docker-cli"
script { script {
env.IMAGE_BASE_NAME = "jdk14-alpine" env.IMAGE_BASE_NAME = "jdk14-alpine"
env.RELEASE_TAG_PREFIX = "release-" env.RELEASE_TAG_PREFIX = "release-"