opengnsys
/
oggui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add intermediate step to publish alpine images

oggui/translations
Nicolas Arenas 2024-10-24 21:48:24 +02:00
parent af04ef771f
commit cdcea5ac46
3 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ogWebconsole/Dockerfile
View File

@ -1,7 +1,6 @@
FROM node:22.1.0 FROM node:22.10-alpine
WORKDIR /app WORKDIR /app
RUN apt -y update && apt -y install chromium
RUN npm install -g npm@latest RUN npm install -g npm@latest

15
ogWebconsole/Dockerfile-testing Normal file
View File

@ -0,0 +1,15 @@
FROM node:22.10
WORKDIR /app
RUN apt -y update && apt -y install chromium
RUN npm install -g npm@latest
RUN npm install -g @angular/cli@^12.0.0
COPY . /app
RUN npm install
EXPOSE 4200
CMD ["ng", "serve", "--host", "0.0.0.0", "--disable-host-check"]

22
ogWebconsole/Jenkinsfile vendored
View File

@ -11,7 +11,7 @@ pipeline {
checkout scm checkout scm
} }
} }
stage('Build') { stage('Build Testing Image') {
steps { steps {
sh "printenv" sh "printenv"
echo 'Building....' echo 'Building....'
@ -21,16 +21,17 @@ pipeline {
dir('ogWebconsole') { dir('ogWebconsole') {
IMAGE_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}" IMAGE_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}"
IMAGE_ID_TESTING = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}-testing"
if (BRANCH_NAME == 'main') { if (BRANCH_NAME == 'main') {
LATEST_ID = 'latest' LATEST_ID = 'latest'
} else { } else {
LATEST_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-latest" LATEST_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-latest"
} }
env.IMAGE_ID_TESTING = IMAGE_ID_TESTING
env.IMAGE_ID = IMAGE_ID env.IMAGE_ID = IMAGE_ID
env.LATEST_ID = LATEST_ID env.LATEST_ID = LATEST_ID
env.BRANCH_NAME = BRANCH_NAME env.BRANCH_NAME = BRANCH_NAME
docker.build("${IMAGE_ID}", "-f Dockerfile .") docker.build("${IMAGE_ID}", "-f Dockerfile- .")
docker.build("${LATEST_ID}", "-f Dockerfile .")
} }
} }
} }
@ -41,10 +42,20 @@ pipeline {
sh ''' sh '''
cd ogWebconsole cd ogWebconsole
mkdir -p test-results mkdir -p test-results
docker run -p 4200:4200 --name oggui-testing -e CHROME_BIN=/usr/bin/chromium -v $(pwd)/karma.conf.js:/app/karma.conf.js -v $(pwd)/.env:/app/.env -d $IMAGE_ID docker run -p 4200:4200 --name oggui-testing -e CHROME_BIN=/usr/bin/chromium -v $(pwd)/karma.conf.js:/app/karma.conf.js -v $(pwd)/.env:/app/.env -d $IMAGE_ID_TESTING
docker exec oggui-testing ng test --watch=false --source-map=false --karma-config=karma.conf.js docker exec oggui-testing ng test --watch=false --source-map=false --karma-config=karma.conf.js
''' '''
}
}
stage('Build') {
steps {
echo 'Building....'
script {
dir('ogWebconsole') {
docker.build("${IMAGE_ID}", "-f Dockerfile .")
docker.build("${LATEST_ID}", "-f Dockerfile .")
}
}
} }
} }
stage('Push') { stage('Push') {
@ -69,6 +80,7 @@ pipeline {
echo 'Cleaning up....' echo 'Cleaning up....'
sh "docker rmi ${IMAGE_ID} || true" sh "docker rmi ${IMAGE_ID} || true"
sh "docker rmi ${LATEST_ID} || true" sh "docker rmi ${LATEST_ID} || true"
sh "docker rmi ${IMAGE_ID_TESTING} || true"
script { script {
def committerEmail = sh ( def committerEmail = sh (
script: "git show -s --pretty=%ae", script: "git show -s --pretty=%ae",