Skip to content

Commit f7699fa

Browse files
federicaagostinienricovianello
authored andcommitted
Add Dockerfile for voms-aa (#1164)
Rename voms-aa final image to: indigoiam/iam-voms-aa
1 parent 0503c27 commit f7699fa

File tree

5 files changed

+49
-11
lines changed

5 files changed

+49
-11
lines changed

.github/workflows/maven.yml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ jobs:
4040
run: |
4141
cp iam-login-service/target/iam-login-service.war iam-login-service/docker
4242
cp iam-test-client/target/iam-test-client.jar iam-test-client/docker
43-
44-
- name: Generate buildpacks
45-
run: mvn -DskipTests -U -B -q spring-boot:build-image -Dspring-boot.build-image.builder=paketobuildpacks/builder:tiny
43+
cp iam-voms-aa/target/iam-voms-aa.jar iam-voms-aa/docker
4644
4745
- name: Setup QEMU
4846
uses: docker/setup-qemu-action@v3
@@ -65,7 +63,8 @@ jobs:
6563

6664
- name: Docker metainformation for iam-login-service
6765
id: ls-meta
68-
uses: docker/metadata-action@v5
66+
# tag v5
67+
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051
6968
with:
7069
images: indigoiam/iam-login-service
7170
tags: |
@@ -74,15 +73,27 @@ jobs:
7473
7574
- name: Docker metainformation for iam-test-client
7675
id: tc-meta
77-
uses: docker/metadata-action@v5
76+
# tag v5
77+
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051
7878
with:
7979
images: indigoiam/iam-test-client
8080
tags: |
8181
type=sha
8282
type=ref,event=tag
8383
84+
- name: Docker metainformation for iam-voms-aa
85+
id: va-meta
86+
# tag v5
87+
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051
88+
with:
89+
images: indigoiam/iam-voms-aa
90+
tags: |
91+
type=sha
92+
type=ref,event=tag
93+
8494
- name: Build & push iam-login-service docker image
85-
uses: docker/build-push-action@v6
95+
# tag v6
96+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
8697
with:
8798
tags: ${{ steps.ls-meta.outputs.tags }}
8899
labels: ${{ steps.ls-meta.outputs.labels }}
@@ -92,11 +103,23 @@ jobs:
92103
push: ${{ startsWith(github.ref, 'refs/tags/') }}
93104

94105
- name: Build & push iam-test-client docker image
95-
uses: docker/build-push-action@v6
106+
# tag v6
107+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
96108
with:
97109
tags: ${{ steps.tc-meta.outputs.tags }}
98110
labels: ${{ steps.tc-meta.outputs.labels }}
99111
context: iam-test-client/docker/
100112
file: iam-test-client/docker/Dockerfile.prod
101113
platforms: linux/amd64,linux/arm64
102114
push: ${{ startsWith(github.ref, 'refs/tags/') }}
115+
116+
- name: Build & push iam-voms-aa docker image
117+
# tag v6
118+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
119+
with:
120+
tags: ${{ steps.va-meta.outputs.tags }}
121+
labels: ${{ steps.va-meta.outputs.labels }}
122+
context: iam-voms-aa/docker/
123+
file: iam-voms-aa/docker/Dockerfile.prod
124+
platforms: linux/amd64,linux/arm64
125+
push: ${{ startsWith(github.ref, 'refs/tags/') }}

compose/voms-deploy/.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ DB_IMAGE=mysql
55
DB_IMAGE_TAG=5.7
66
NGINX_IMAGE=baltig.infn.it:4567/cnafsd/ngx_http_voms_module/nginx-httpg-voms
77
NGINX_IMAGE_TAG=latest
8-
VOMS_AA_IMAGE=indigoiam/voms-aa-bp
9-
VOMS_AA_IMAGE_TAG=v1.8.3
8+
VOMS_AA_IMAGE=indigoiam/iam-voms-aa
9+
VOMS_AA_IMAGE_TAG=latest
1010
GRID_CLIENTS_IMAGE=indigoiam/robot-framework
1111
GRID_CLIENTS_IMAGE_TAG=latest
1212
IAM_IMAGE=indigoiam/iam-login-service

compose/voms-replica/.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ DB_IMAGE=mysql
55
DB_IMAGE_TAG=8.3
66
NGINX_IMAGE=baltig.infn.it:4567/cnafsd/ngx_http_voms_module/nginx-httpg-voms
77
NGINX_IMAGE_TAG=latest
8-
VOMS_AA_IMAGE=indigoiam/voms-aa-bp
9-
VOMS_AA_IMAGE_TAG=v1.8.3
8+
VOMS_AA_IMAGE=indigoiam/iam-voms-aa
9+
VOMS_AA_IMAGE_TAG=latest
1010
GRID_CLIENTS_IMAGE=indigoiam/robot-framework
1111
GRID_CLIENTS_IMAGE_TAG=latest
1212
IAM_IMAGE=indigoiam/iam-login-service

iam-voms-aa/docker/Dockerfile.prod

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM eclipse-temurin:17 AS builder
2+
WORKDIR /workspace
3+
COPY iam-voms-aa.jar /workspace/
4+
RUN java -Djarmode=layertools -jar iam-voms-aa.jar extract
5+
6+
FROM eclipse-temurin:17
7+
WORKDIR /workspace
8+
9+
COPY --from=builder /workspace/dependencies/ \
10+
/workspace/spring-boot-loader/ \
11+
/workspace/snapshot-dependencies/ \
12+
/workspace/application/ /workspace/
13+
14+
CMD ["/bin/sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher"]

iam-voms-aa/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@
192192
</dependencies>
193193

194194
<build>
195+
<finalName>iam-voms-aa</finalName>
195196
<pluginManagement>
196197
<plugins>
197198
<plugin>

0 commit comments

Comments
 (0)