Skip to content

Commit d3d5fa0

Browse files
committed
cleanup docker image
1 parent 243d2b9 commit d3d5fa0

File tree

3 files changed

+47
-23
lines changed

3 files changed

+47
-23
lines changed

.github/actions/publish-docker-image/action.yml

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,30 +42,27 @@ inputs:
4242
docker_tag:
4343
required: false
4444
description: 'additional docker tags'
45-
do_push:
46-
required: false
47-
default: 'false'
48-
description: 'whether or not to actually push the image'
45+
4946
runs:
5047
using: "composite"
5148
steps:
5249
- uses: actions/checkout@v4
53-
54-
- name: Download OpenTelemetry
55-
shell: bash
56-
run: |-
57-
# "jq -r" removes the quotation marks, that would trip up "wget"
58-
URL=$(grep "val openTelemetryAgentUrl = " build.gradle.kts | awk -F'= ' '{print $2}' | jq -r)
59-
wget -O ${{ inputs.rootDir }}/opentelemetry-javaagent.jar -q $URL
60-
61-
#####################
62-
# Login to DockerHub
63-
#####################
64-
- name: DockerHub login
65-
uses: docker/login-action@v2
66-
with:
67-
username: ${{ inputs.docker_user }}
68-
password: ${{ inputs.docker_token }}
50+
#
51+
# - name: Download OpenTelemetry
52+
# shell: bash
53+
# run: |-
54+
# # "jq -r" removes the quotation marks, that would trip up "wget"
55+
# URL=$(grep "val openTelemetryAgentUrl = " build.gradle.kts | awk -F'= ' '{print $2}' | jq -r)
56+
# wget -O ${{ inputs.rootDir }}/opentelemetry-javaagent.jar -q $URL
57+
#
58+
# #####################
59+
# # Login to DockerHub
60+
# #####################
61+
# - name: DockerHub login
62+
# uses: docker/login-action@v2
63+
# with:
64+
# username: ${{ inputs.docker_user }}
65+
# password: ${{ inputs.docker_token }}
6966

7067
#####################
7168
# Build JAR file
@@ -74,7 +71,8 @@ runs:
7471
- name: Build Controlplane
7572
shell: bash
7673
run: |-
77-
./gradlew -p ${{ inputs.rootDir }} shadowJar
74+
# ./gradlew -p ${{ inputs.rootDir }} dockerize
75+
echo "test"
7876

7977
###############################
8078
# Set metadata of docker image
@@ -95,6 +93,13 @@ runs:
9593
type=raw,value=latest,enable={{is_default_branch}}
9694
type=sha
9795
96+
- shell: bash
97+
run: |
98+
echo "TAGS:"
99+
echo ${{ steps.meta.outputs.tags }}
100+
echo "LABELS:"
101+
echo ${{ steps.meta.outputs.labels }}
102+
98103
###############################
99104
# Build and push the image
100105
###############################
@@ -106,7 +111,7 @@ runs:
106111
build-args: |
107112
JAR=${{ inputs.rootDir }}/build/libs/${{ inputs.imagename }}.jar
108113
OTEL_JAR=${{ inputs.rootDir }}/opentelemetry-javaagent.jar
109-
push: ${{ inputs.do_push == 'true' }}
114+
push: true
110115
tags: ${{ steps.meta.outputs.tags }}
111116
labels: ${{ steps.meta.outputs.labels }}
112117

.github/workflows/publish-new-release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ jobs:
119119
imagename: ${{ matrix.variant.img }}
120120
docker_user: ${{ secrets.DOCKER_HUB_USER }}
121121
docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
122-
do_push: 'true'
123122

124123
# Release: Helm Charts
125124
helm-release:

.github/workflows/test-docker.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: test docker
2+
3+
on:
4+
push:
5+
6+
jobs:
7+
test:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Export RELEASE_VERSION env
11+
run: |
12+
echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
13+
- uses: ./.github/actions/publish-docker-image
14+
name: Publish ${{ matrix.variant.img }}
15+
with:
16+
docker_tag: ${{ env.RELEASE_VERSION }}
17+
rootDir: edc-controlplane/edc-runtime-memory
18+
imagename: edc-runtime-memory
19+
docker_user: any
20+
docker_token: any

0 commit comments

Comments
 (0)