Skip to content

Commit

Permalink
Simpler Dockerfiles, with more platforms
Browse files Browse the repository at this point in the history
- add ubuntu and centos images
- leverage the upstream packages for rpm and deb platforms
- for alpine, us the aports
- simplify update.sh
  • Loading branch information
Guillaume Quintard committed May 3, 2019
1 parent 55d15a6 commit e00ecd5
Show file tree
Hide file tree
Showing 39 changed files with 420 additions and 1,059 deletions.
20 changes: 12 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@ language: bash
services: docker

env:
- VERSION=6.2 VARIANT=stretch
- VERSION=6.2 VARIANT=alpine3.8
- VERSION=6.0 VARIANT=stretch
- VERSION=6.0 VARIANT=alpine3.8
- VERSION=4.1 VARIANT=stretch
- VERSION=4.1 VARIANT=alpine3.8
- VERSION=6.0 DIST=debian REL=stretch
- VERSION=6.0 DIST=ubuntu REL=xenial
- VERSION=6.0 DIST=ubuntu REL=bionic
- VERSION=6.0 DIST=centos REL=7
- VERSION=6.0 DIST=alpine REL=3.8
- VERSION=6.2 DIST=debian REL=stretch
- VERSION=6.2 DIST=ubuntu REL=xenial
- VERSION=6.2 DIST=ubuntu REL=bionic
- VERSION=6.2 DIST=centos REL=7
- VERSION=6.2 DIST=alpine REL=3.8

install:
- git clone https://github.com/docker-library/official-images.git ~/official-images

before_script:
- env | sort
- cd "$VERSION/$VARIANT"
- image="varnish:${VERSION}-${VARIANT}"
- cd "$VERSION/${DIST}/${REL}"
- image="varnish:${VERSION}-${DIST}-${REL}"

script:
- travis_retry docker build -t "$image" .
Expand Down
107 changes: 0 additions & 107 deletions 4.1/alpine3.8/Dockerfile

This file was deleted.

11 changes: 0 additions & 11 deletions 4.1/alpine3.8/fix-compat-execinfo.patch

This file was deleted.

44 changes: 0 additions & 44 deletions 4.1/alpine3.8/fix-stack-overflow.patch

This file was deleted.

11 changes: 0 additions & 11 deletions 4.1/alpine3.8/musl-mode_t.patch

This file was deleted.

11 changes: 0 additions & 11 deletions 4.1/alpine3.8/varnish-4.1.3_fix_Werror_el6.patch

This file was deleted.

111 changes: 0 additions & 111 deletions 4.1/stretch/Dockerfile

This file was deleted.

34 changes: 34 additions & 0 deletions 6.0/alpine/3.8/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#

#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM alpine:3.8

RUN apk add git alpine-sdk && \
adduser -D builder && \
addgroup builder abuild && \
chgrp abuild /var/cache/distfiles && \
su builder -c "abuild-keygen -na" && \
chmod g+w /var/cache/distfiles && \
su builder -c "git clone https://git.alpinelinux.org/aports /tmp/aports" && \
cd /tmp/aports/main/varnish && \
su builder -c "abuild checksum && abuild -r" && \
apk add ~builder/packages/main/x86_64/*.apk --allow-untrusted

WORKDIR /usr/local/var/varnish
RUN chown -R varnish:varnish /usr/local/var/varnish
VOLUME /usr/local/var/varnish

COPY docker-varnish-entrypoint /usr/local/bin/
ENTRYPOINT ["docker-varnish-entrypoint"]

EXPOSE 80
CMD ["varnishd", "-F", "-f", "/usr/local/etc/varnish/default.vcl"]
File renamed without changes.
Loading

0 comments on commit e00ecd5

Please sign in to comment.