Skip to content

Commit

Permalink
feat(deps): update molecule to 6.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
gofrolist committed Sep 14, 2023
1 parent 7cb8c7a commit bca9a80
Show file tree
Hide file tree
Showing 7 changed files with 252 additions and 298 deletions.
1 change: 1 addition & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
uses: docker/build-push-action@v4.1.1
with:
context: .
file: Dockerfile.buster
push: ${{ github.event_name == 'release' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
uses: docker/build-push-action@v4.1.1
with:
context: .
file: Dockerfile.buster
load: true
tags: ${{ env.DOCKER_IMAGE_NAME }}:test
cache-from: type=gha
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
uses: docker/build-push-action@v4.1.1
with:
context: .
file: Dockerfile.buster
load: true
tags: ${{ env.DOCKER_IMAGE_NAME }}:test
cache-from: type=gha
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9.17-alpine3.18 AS builder
FROM python:3.9.18-alpine3.18 AS builder

ARG BUILD_DEPS="\
docker \
Expand All @@ -13,13 +13,14 @@ ARG BUILD_DEPS="\

RUN apk add --update --no-cache ${BUILD_DEPS}


COPY Pipfile* .
RUN pip install pipenv && \
pipenv install --deploy --system

FROM python:3.9.17-alpine3.18 AS runtime
FROM python:3.9.18-alpine3.18 AS runtime

LABEL "maintainer"="Eugene Vasilenko <gmrnsk@gmail.com>"
LABEL "maintainer"="Evgenii Vasilenko <gmrnsk@gmail.com>"
LABEL "repository"="https://github.com/gofrolist/molecule-action"
LABEL "com.github.actions.name"="molecule"
LABEL "com.github.actions.description"="Run Ansible Molecule"
Expand All @@ -28,7 +29,6 @@ LABEL "com.github.actions.color"="green"

COPY --from=builder /usr/local/lib/python3.9/site-packages/ /usr/local/lib/python3.9/site-packages/
COPY --from=builder /usr/local/bin/ansible* \
/usr/local/bin/cookiecutter \
/usr/local/bin/molecule \
/usr/local/bin/pre-commit* \
/usr/local/bin/yamllint \
Expand Down
17 changes: 9 additions & 8 deletions Dockerfile.buster
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9.16-slim-bullseye AS builder
FROM python:3.9.18-slim-bullseye AS builder

ARG BUILD_DEPS="\
docker \
Expand All @@ -18,27 +18,28 @@ COPY Pipfile* .
RUN pip install --no-cache-dir pipenv && \
pipenv install --deploy --system

FROM python:3.9.16-slim-bullseye AS runtime
FROM python:3.9.18-slim-bullseye AS runtime

LABEL "maintainer"="Eugene Vasilenko <gmrnsk@gmail.com>"
LABEL "maintainer"="Evgenii Vasilenko <gmrnsk@gmail.com>"
LABEL "repository"="https://github.com/gofrolist/molecule-action"
LABEL "com.github.actions.name"="molecule"
LABEL "com.github.actions.description"="Run Ansible Molecule"
LABEL "com.github.actions.icon"="upload"
LABEL "com.github.actions.color"="green"

COPY --from=builder /usr/local/lib/python3.9/site-packages/ /usr/local/lib/python3.9/site-packages/
COPY --from=builder /usr/local/bin/ansible* /usr/local/bin/
COPY --from=builder /usr/local/bin/flake8 /usr/local/bin/flake8
COPY --from=builder /usr/local/bin/molecule /usr/local/bin/molecule
COPY --from=builder /usr/local/bin/pytest /usr/local/bin/pytest
COPY --from=builder /usr/local/bin/yamllint /usr/local/bin/yamllint
COPY --from=builder /usr/local/bin/ansible* \
/usr/local/bin/molecule \
/usr/local/bin/pre-commit* \
/usr/local/bin/yamllint \
/usr/local/bin/

ARG PACKAGES="\
docker \
git \
openssh-client \
podman \
rsync \
tini \
"

Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name = "pypi"
[packages]
ansible-lint = "*"
molecule-inspec = "*"
molecule = "==5.1.0"
molecule = "==6.0.2"
molecule-plugins = {version = "*", extras = ["docker", "podman"]}

[dev-packages]
Expand Down
Loading

0 comments on commit bca9a80

Please sign in to comment.