Skip to content
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.

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

feat(deps): update molecule to 6.0.2 #265

Merged
merged 5 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
9 changes: 4 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,20 @@ 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
cache-to: type=gha,mode=max

- name: Test Molecule default pipeline
env:
ANSIBLE_FORCE_COLOR: '1'
run: |
docker run \
-v /var/run/docker.sock:/var/run/docker.sock \
-e PY_COLORS=1 \
${{ env.DOCKER_IMAGE_NAME }}:test \
sh -c "\
molecule --version \
&& molecule init role --driver-name docker gofrolist.validate && cd validate \
&& sed -i 's/gofrolist.//g' molecule/default/converge.yml \
&& molecule test \
&& molecule init scenario --driver-name docker validate \
&& molecule test --scenario-name validate --driver-name docker \
"
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
19 changes: 10 additions & 9 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 \
docker.io \
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