Skip to content

Commit

Permalink
Merge branch '4-upgrade-packages' into 'master'
Browse files Browse the repository at this point in the history
#4: Adds `apk upgrade`

Closes #4

See merge request ix.ai/openvpn!16
  • Loading branch information
tlex committed Apr 4, 2020
2 parents 43d1f8f + 5cc6b54 commit a93656f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 14 deletions.
14 changes: 2 additions & 12 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ test:
- apk add --no-cache bash git iptables
- git clone https://github.com/docker-library/official-images.git official-images
script:
- official-images/test/run.sh "$IMAGE"
- test/run.sh "$IMAGE"
- official-images/test/run.sh "${DOCKERHUB_REPO_PREFIX}/${DOCKERHUB_REPO_NAME}"
- test/run.sh "${DOCKERHUB_REPO_PREFIX}/${DOCKERHUB_REPO_NAME}"
only:
- merge_requests

Expand Down Expand Up @@ -66,13 +66,3 @@ dockerhub:readme:
entrypoint: ['']
script:
- node /app/index.js

microbadger:
stage: post_release
rules:
- if: '$MICROBADGER_TOKEN =~ /.+/ && $DOCKERHUB_REPO_NAME =~ /.+/'
when: on_success
image: alpine:latest
script:
- curl -V||apk add curl
- curl -s -XPOST "https://hooks.microbadger.com/images/${DOCKERHUB_REPO_PREFIX}/${DOCKERHUB_REPO_NAME}/${MICROBADGER_TOKEN}"
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ LABEL maintainer="[email protected]" \

# Testing: pamtester
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories && \
apk --no-cache upgrade && \
apk add --no-cache --update openvpn \
iptables \
bash \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
[![Pipeline Status](https://gitlab.com/ix.ai/openvpn/badges/master/pipeline.svg)](https://gitlab.com/ix.ai/openvpn/)
[![Docker Stars](https://img.shields.io/docker/stars/ixdotai/openvpn.svg)](https://hub.docker.com/r/ixdotai/openvpn/)
[![Docker Pulls](https://img.shields.io/docker/pulls/ixdotai/openvpn.svg)](https://hub.docker.com/r/ixdotai/openvpn/)
[![ImageLayers](https://images.microbadger.com/badges/image/ixdotai/openvpn.svg)](https://microbadger.com/images/ixdotai/openvpn)
[![Latest Version](https://images.microbadger.com/badges/version/ixdotai/openvpn.svg)](https://microbadger.com/images/ixdotai/openvpn)
[![Docker Image Version (latest)](https://img.shields.io/docker/v/ixdotai/openvpn/latest)](https://hub.docker.com/r/ixdotai/openvpn/)
[![Docker Image Size (latest)](https://img.shields.io/docker/image-size/ixdotai/openvpn/latest)](https://hub.docker.com/r/ixdotai/openvpn/)
[![Gitlab Project](https://img.shields.io/badge/GitLab-Project-554488.svg)](https://gitlab.com/ix.ai/openvpn/)


Expand Down

0 comments on commit a93656f

Please sign in to comment.