Skip to content

feat(70552): refactoring #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bogdandina merged 4 commits into from
Dec 19, 2025
Merged

feat(70552): refactoring #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b94eab
feat(70552): refactoring
bogdandina Dec 19, 2025
c9c66f1
feat(70552): fixes
bogdandina Dec 19, 2025
20b8670
feat(70552): fixes
bogdandina Dec 19, 2025
254f43e
feat(70552): fix the test dockerfiles
bogdandina Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions .github/workflows/build-test-and-push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,14 @@ jobs:

strategy:
matrix:
image:
- java-25
- node-22
include:
- language: java
version: "25"
image: 25-java

- language: node
version: "22"
image: 22-node

steps:
- name: Checkout code
Expand All @@ -32,19 +37,19 @@ jobs:
uses: hadolint/[email protected]
with:
config: .hadolint.yaml
dockerfile: "./${{ matrix.image }}/Dockerfile"
dockerfile: "./${{ matrix.language }}/Dockerfile"

- name: Build base image
uses: docker/build-push-action@v6
with:
context: ./${{ matrix.image }}
context: ./${{ matrix.language }}
push: false
tags: ${{ matrix.image }}-test:latest

- name: Build test image
uses: docker/build-push-action@v6
with:
context: ./${{ matrix.image }}/test
context: ./${{ matrix.language }}/test
push: false
tags: base-image-test:${{ matrix.image }}-test

Expand All @@ -61,9 +66,14 @@ jobs:

strategy:
matrix:
image:
- java-25
- node-22
include:
- language: java
version: "25"
image: 25-java

- language: node
version: "22"
image: 22-node

steps:
- name: Checkout code
Expand Down Expand Up @@ -91,7 +101,7 @@ jobs:
with:
images: hsldevcom/infodevops-docker-base-images
tags: |
type=edge,suffix=-${{ matrix.image }},enable={{is_default_branch}}
type=edge,prefix=${{ matrix.image }},enable={{is_default_branch}}
type=semver,suffix=-${{ matrix.image }},pattern={{version}}
type=semver,suffix=-${{ matrix.image }},pattern={{major}}.{{minor}}
type=semver,suffix=-${{ matrix.image }},pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
Expand All @@ -102,7 +112,7 @@ jobs:
- name: Build and push Docker image
uses: docker/build-push-action@v6
with:
context: ./${{ matrix.image }}
context: ./${{ matrix.language }}
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
Expand Down
3 changes: 0 additions & 3 deletions java-25/test/Dockerfile
View file
Open in desktop

This file was deleted.

0 java-25/Dockerfile → java/Dockerfile
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions java/test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM 25-java-test:latest

CMD ["echo", "hello"]
0 node-22/Dockerfile → node/Dockerfile
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion node-22/test/Dockerfile → node/test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node-22-test:latest
FROM 22-node-test:latest

USER root
RUN apt-get update \
Expand Down