Skip to content

Commit

Permalink
Merge branch 'master' of github.com:tuxpeople/docker-debugcontainer
Browse files Browse the repository at this point in the history
* 'master' of github.com:tuxpeople/docker-debugcontainer:
  Bump alpine from 3.14.1 to 3.14.2
  Bump docker/build-push-action from 2.6.1 to 2.7.0
  Bump alpine from 3.14.0 to 3.14.1
  Bump docker/build-push-action from 2.5.0 to 2.6.1
  Bump docker/login-action from 1.9.0 to 1.10.0
  add openssl for s_client
  • Loading branch information
tuxpeople committed Sep 27, 2021
2 parents d2c4c47 + 246ee52 commit dab20b1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pullrequests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2.5.0
uses: docker/build-push-action@v2.7.0
with:
context: .
file: ./Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ jobs:
-
name: Login to Quay.io
if: github.event_name != 'pull_request'
uses: docker/login-action@v1.9.0
uses: docker/login-action@v1.10.0
with:
registry: quay.io
username: ${{ env.QUAY_USER }}
password: ${{ secrets.REGISTRY_TOKEN }}
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2.5.0
uses: docker/build-push-action@v2.7.0
with:
context: .
file: ./Dockerfile
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# - https://github.com/dbamaster/mssql-tools-alpine
# - https://github.com/ssro/dnsperf

FROM alpine:3.14.0
FROM alpine:3.14.2

# Resolve DL4006 https://github.com/hadolint/hadolint/wiki/DL4006
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
Expand Down Expand Up @@ -47,6 +47,7 @@ RUN chmod +x /scripts/* \
net-tools \
nfs-utils \
nmap \
openssl \
p7zip \
screen \
socat \
Expand Down

0 comments on commit dab20b1

Please sign in to comment.