Skip to content

Commit

Permalink
Merge pull request #98 from arillso/dependabot/docker/alpine-3.14.2
Browse files Browse the repository at this point in the history
Bump alpine from 3.13.5 to 3.14.2
  • Loading branch information
sbaerlocher authored Oct 21, 2021
2 parents 892239f + 0f228c6 commit 8691c3c
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v2

- name: Lint Code Base
uses: github/super-linter@v4.1.0
uses: github/super-linter@v4.8.1
env:
DEFAULT_BRANCH: main
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,16 @@ and [human-readable changelog](https://keepachangelog.com/en/1.0.0/).

### Changed

- Bump alpine from 3.13.5 to 3.14.2
- Bump ansible-core from 2.11.1 to 2.11.6
- Bump ansible-lint from 5.0.11 to 5.2.1
- Bump crazy-max/ghaction-docker-meta from 3.3.0 to 3.5.0
- Bump flake8 from 3.9.2 to 4.0.1
- Bump github/super-linter from 4.1.0 to 4.8.1
- Bump molecule-lxd from 0.2 to 0.3
- Bumps molecule-containers from 0.2.1 to 1.0.0.
- Bump molecule-podman from 0.3.0 to 1.0.1
- Bump molecule[docker,lint,podman,windows] from 3.3.3 to 3.5.2
- Bumps molecule-containers from 0.2.1 to 1.0.0

## 0.0.2

Expand Down
11 changes: 5 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.13.5 as builder
FROM alpine:3.14.2 as builder

RUN apk --update --no-cache add \
gcc \
Expand All @@ -10,9 +10,8 @@ RUN apk --update --no-cache add \
ca-certificates \
git \
openssh-client \
rsync

RUN apk --update --no-cache add --virtual \
rsync \
&& apk --update --no-cache add --virtual \
.build-deps \
sshpass \
python3-dev \
Expand All @@ -31,9 +30,9 @@ RUN set -eux \
&& find /usr/lib/ -name '__pycache__' -print0 | xargs -0 -n1 rm -rf \
&& find /usr/lib/ -name '*.pyc' -print0 | xargs -0 -n1 rm -rf

FROM alpine:3.13.5
FROM alpine:3.14.2

COPY --from=builder /usr/lib/python3.8/site-packages/ /usr/lib/python3.8/site-packages/
COPY --from=builder /usr/lib/python3.9/site-packages/ /usr/lib/python3.9/site-packages/
COPY --from=builder /usr/bin/ansible /usr/bin/ansible
COPY --from=builder /usr/bin/ansible-connection /usr/bin/ansible-connection
COPY --from=builder /usr/bin/flake8 /usr/bin/flake8
Expand Down
12 changes: 6 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ansible-core==2.11.1
ansible-lint==5.0.11
flake8==3.9.2
ansible-core==2.11.6
ansible-lint==5.2.1
flake8==4.0.1
molecule-azure==0.5.0
molecule-containers==1.0.0
molecule-digitalocean==0.1
molecule-docker==0.3.3
molecule-docker==1.0.2
molecule-ec2==0.3
molecule-gce==0.2
molecule-libvirt
molecule-lxd===0.3
molecule-openstack==0.3
molecule-podman==0.3.0
molecule-podman==1.0.1
molecule-vagrant==0.6.3
molecule[docker,podman,windows,lint]==3.3.3
molecule[docker,podman,windows,lint]==3.5.2
testinfra==6.0.0

0 comments on commit 8691c3c

Please sign in to comment.