iktdev/MediaProcessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Path

Browse Source
This commit is contained in:
bskjon 2024-06-30 01:01:23 +02:00
parent 07f21d4f1d
commit a97432c69b
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/v2.yml vendored
View File

@ -95,8 +95,10 @@ jobs:
- name: Extract version from build.gradle.kts - name: Extract version from build.gradle.kts
id: extract_version id: extract_version
run: | run: |
VERSION=$(grep '^version\\s*=\\s*".*"' ./apps/processer/build.gradle.kts | sed 's/^version\\s*=\\s*"\(.*\)"/\1/') VERSION=$(cat ./apps/processer/build.gradle.kts | grep '^version\s*=\s*\".*\"' | sed 's/^version\s*=\s*\"\(.*\)\"/\1/')
echo "::set-output name=version::$VERSION echo "VERSION=$VERSION"
echo "VERSION=$VERSION" >> $GITHUB_ENV
- name: Build Processer module - name: Build Processer module
id: build-processer id: build-processer
@ -123,7 +125,7 @@ jobs:
file: ./dockerfiles/DebianJavaFfmpeg file: ./dockerfiles/DebianJavaFfmpeg
build-args: build-args:
MODULE_NAME=processer MODULE_NAME=processer
APP_VERSION=${{ steps.extract_version.outputs.version }} APP_VERSION=${{ env.VERSION }}
push: true push: true
tags: | tags: |
bskjon/mediaprocessing-processer:v2 bskjon/mediaprocessing-processer:v2
@ -147,12 +149,13 @@ jobs:
path: ~/.gradle/caches path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('shared/build.gradle.kts') }} key: ${{ runner.os }}-gradle-${{ hashFiles('shared/build.gradle.kts') }}
- name: Extract version from build.gradle.kts - name: Extract version from build.gradle.kts
id: extract_version id: extract_version
run: | run: |
VERSION=$(grep '^version\\s*=\\s*".*"' ./apps/converter/build.gradle.kts | sed 's/^version\\s*=\\s*"\(.*\)"/\1/') VERSION=$(cat ./apps/converter/build.gradle.kts | grep '^version\s*=\s*\".*\"' | sed 's/^version\s*=\s*\"\(.*\)\"/\1/')
echo "::set-output name=version::$VERSION echo "VERSION=$VERSION"
echo "VERSION=$VERSION" >> $GITHUB_ENV
- name: Build Converter module - name: Build Converter module
id: build-converter id: build-converter
@ -180,7 +183,7 @@ jobs:
file: ./dockerfiles/DebianJava file: ./dockerfiles/DebianJava
build-args: build-args:
MODULE_NAME=converter MODULE_NAME=converter
APP_VERSION=${{ steps.extract_version.outputs.version }} APP_VERSION=${{ env.VERSION }}
push: true push: true
tags: | tags: |
bskjon/mediaprocessing-converter:v2 bskjon/mediaprocessing-converter:v2

4
dockerfiles/DebianJava
View File

@ -2,6 +2,8 @@ FROM bskjon/azuljava:17
EXPOSE 8080 EXPOSE 8080
ARG MODULE_NAME ARG MODULE_NAME
ARG APP_VERSION
COPY ./apps/${MODULE_NAME}/build/libs/app.jar /usr/share/app/app.jar COPY ./apps/${MODULE_NAME}/build/libs/app.jar /usr/share/app/app.jar
ENV APP_VERSION ENV APP_VERSION=${APP_VERSION}