Skip to content

Commit e8f8ef2

Browse files
authored
Merge pull request #48 from voxpupuli/use_containerfile
feat: use vendor free naming
2 parents bae1596 + 35e9ed5 commit e8f8ef2

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

.github/workflows/build_container.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
with:
3434
registry_password: ${{ secrets.GITHUB_TOKEN }}
3535
build_arch: linux/amd64,linux/arm64
36+
buildfile: ./Containerfile
3637
docker_username: voxpupulibot
3738
docker_password: ${{ secrets.DOCKERHUB_BOT_ADMIN_TOKEN }}
3839
tags: |

.github/workflows/ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
- name: Build image
2727
uses: docker/build-push-action@v6
2828
with:
29+
file: Containerfile
2930
tags: 'ci/test:${{ github.event.number }}'
3031
push: false
3132

.github/workflows/security_scanning.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
- name: Build local container
2525
uses: docker/build-push-action@v6
2626
with:
27+
file: Containerfile
2728
tags: 'ci/test:latest'
2829
push: false
2930

Dockerfile renamed to Containerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ LABEL org.label-schema.maintainer="Voxpupuli Team <voxpupuli@groups.io>" \
1616
org.label-schema.license="AGPL-3.0-or-later" \
1717
org.label-schema.vcs-url="https://github.com/voxpupuli/container-commitlint" \
1818
org.label-schema.schema-version="1.0" \
19-
org.label-schema.dockerfile="/Dockerfile"
19+
org.label-schema.dockerfile="/Containerfile"
2020

21-
COPY Dockerfile /
22-
COPY docker-entrypoint.sh /
23-
COPY docker-entrypoint.d /docker-entrypoint.d
21+
COPY Containerfile /
22+
COPY container-entrypoint.sh /
23+
COPY container-entrypoint.d /container-entrypoint.d
2424
COPY --from=build /npm /npm
2525

2626
RUN apk update && apk upgrade \
2727
&& apk add --no-cache --update bash git \
28-
&& chmod +x /docker-entrypoint.sh \
28+
&& chmod +x /container-entrypoint.sh \
2929
# fix ENOGITREPO Not running from a git repository.
3030
&& git config --global --add safe.directory '*'
3131

@@ -34,5 +34,5 @@ WORKDIR /data
3434
ENV PATH="$PATH:/npm/node_modules/.bin"
3535
ENV NODE_OPTIONS="--use-openssl-ca"
3636

37-
ENTRYPOINT [ "/docker-entrypoint.sh" ]
37+
ENTRYPOINT [ "/container-entrypoint.sh" ]
3838
CMD [ "--last" ]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
set -e
55

6-
if [ -d /docker-entrypoint.d/ ]; then
7-
find /docker-entrypoint.d/ -type f -name "*.sh" \
6+
if [ -d /container-entrypoint.d/ ]; then
7+
find /container-entrypoint.d/ -type f -name "*.sh" \
88
-exec echo Running {} \; -exec bash {} \;
99
fi
1010

0 commit comments

Comments
 (0)