diff --git a/.github/workflows/v2.yml b/.github/workflows/v2.yml index a6a9939b..81b568d1 100644 --- a/.github/workflows/v2.yml +++ b/.github/workflows/v2.yml @@ -95,8 +95,10 @@ jobs: - name: Extract version from build.gradle.kts id: extract_version run: | - VERSION=$(grep '^version\\s*=\\s*".*"' ./apps/processer/build.gradle.kts | sed 's/^version\\s*=\\s*"\(.*\)"/\1/') - echo "::set-output name=version::$VERSION + VERSION=$(cat ./apps/processer/build.gradle.kts | grep '^version\s*=\s*\".*\"' | sed 's/^version\s*=\s*\"\(.*\)\"/\1/') + echo "VERSION=$VERSION" + echo "VERSION=$VERSION" >> $GITHUB_ENV + - name: Build Processer module id: build-processer @@ -123,7 +125,7 @@ jobs: file: ./dockerfiles/DebianJavaFfmpeg build-args: MODULE_NAME=processer - APP_VERSION=${{ steps.extract_version.outputs.version }} + APP_VERSION=${{ env.VERSION }} push: true tags: | bskjon/mediaprocessing-processer:v2 @@ -147,12 +149,13 @@ jobs: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('shared/build.gradle.kts') }} - - name: Extract version from build.gradle.kts id: extract_version run: | - VERSION=$(grep '^version\\s*=\\s*".*"' ./apps/converter/build.gradle.kts | sed 's/^version\\s*=\\s*"\(.*\)"/\1/') - echo "::set-output name=version::$VERSION + VERSION=$(cat ./apps/converter/build.gradle.kts | grep '^version\s*=\s*\".*\"' | sed 's/^version\s*=\s*\"\(.*\)\"/\1/') + echo "VERSION=$VERSION" + echo "VERSION=$VERSION" >> $GITHUB_ENV + - name: Build Converter module id: build-converter @@ -180,7 +183,7 @@ jobs: file: ./dockerfiles/DebianJava build-args: MODULE_NAME=converter - APP_VERSION=${{ steps.extract_version.outputs.version }} + APP_VERSION=${{ env.VERSION }} push: true tags: | bskjon/mediaprocessing-converter:v2 diff --git a/dockerfiles/DebianJava b/dockerfiles/DebianJava index 7351f551..8c118b7a 100644 --- a/dockerfiles/DebianJava +++ b/dockerfiles/DebianJava @@ -2,6 +2,8 @@ FROM bskjon/azuljava:17 EXPOSE 8080 ARG MODULE_NAME +ARG APP_VERSION + COPY ./apps/${MODULE_NAME}/build/libs/app.jar /usr/share/app/app.jar -ENV APP_VERSION \ No newline at end of file +ENV APP_VERSION=${APP_VERSION} \ No newline at end of file