From 70c7bcf4589367df53d1580cfab268e1e22fe01b Mon Sep 17 00:00:00 2001 From: vwout Date: Sun, 29 Dec 2019 23:21:01 +0100 Subject: [PATCH] Update based images to Alpine 3.11 and Debian 10 (Buster) --- docker-compose.yml | 2 +- openluup-alpine/Dockerfile | 4 ++-- {openluup-stretch => openluup-debian}/.dockerignore | 0 {openluup-stretch => openluup-debian}/Dockerfile | 6 +++--- {openluup-stretch => openluup-debian}/hooks/build | 0 {openluup-stretch => openluup-debian}/hooks/post_push | 0 .../openLuup_reload_for_docker | 2 +- readme.md | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) rename {openluup-stretch => openluup-debian}/.dockerignore (100%) rename {openluup-stretch => openluup-debian}/Dockerfile (95%) rename {openluup-stretch => openluup-debian}/hooks/build (100%) rename {openluup-stretch => openluup-debian}/hooks/post_push (100%) rename {openluup-stretch => openluup-debian}/openLuup_reload_for_docker (98%) diff --git a/docker-compose.yml b/docker-compose.yml index fd8a321..351a82a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: openluup-slim-master: image: openluup:master-slim build: - context: ./openluup-stretch + context: ./openluup-debian ports: - "3480:3480" # environment: diff --git a/openluup-alpine/Dockerfile b/openluup-alpine/Dockerfile index ed8b486..82f2306 100644 --- a/openluup-alpine/Dockerfile +++ b/openluup-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.11 MAINTAINER "Vwout " @@ -61,7 +61,7 @@ RUN set -ex \ # Build arguments to install openluup and set metadata labels ARG BUILD_DATE ARG VCS_REF -ARG IMAGE_VERSION="0.0.1" +ARG IMAGE_VERSION="0.1.0" ARG OPENLUUP_FORK="akbooer" ARG OPENLUUP_BRANCH="master" diff --git a/openluup-stretch/.dockerignore b/openluup-debian/.dockerignore similarity index 100% rename from openluup-stretch/.dockerignore rename to openluup-debian/.dockerignore diff --git a/openluup-stretch/Dockerfile b/openluup-debian/Dockerfile similarity index 95% rename from openluup-stretch/Dockerfile rename to openluup-debian/Dockerfile index 81624e5..991f27f 100644 --- a/openluup-stretch/Dockerfile +++ b/openluup-debian/Dockerfile @@ -1,5 +1,5 @@ -# Use Debian 9 minimal image as base -FROM debian:stretch-slim +# Use Debian 10 'Buster' minimal image as base +FROM debian:buster-slim MAINTAINER "Vwout " @@ -12,7 +12,7 @@ RUN apt-get update && \ # Build arguments to set metadata labels ARG BUILD_DATE ARG VCS_REF -ARG IMAGE_VERSION="0.0.1" +ARG IMAGE_VERSION="0.1.0" ARG OPENLUUP_FORK="akbooer" ARG OPENLUUP_BRANCH="master" diff --git a/openluup-stretch/hooks/build b/openluup-debian/hooks/build similarity index 100% rename from openluup-stretch/hooks/build rename to openluup-debian/hooks/build diff --git a/openluup-stretch/hooks/post_push b/openluup-debian/hooks/post_push similarity index 100% rename from openluup-stretch/hooks/post_push rename to openluup-debian/hooks/post_push diff --git a/openluup-stretch/openLuup_reload_for_docker b/openluup-debian/openLuup_reload_for_docker similarity index 98% rename from openluup-stretch/openLuup_reload_for_docker rename to openluup-debian/openLuup_reload_for_docker index 25160a8..618edff 100644 --- a/openluup-stretch/openLuup_reload_for_docker +++ b/openluup-debian/openLuup_reload_for_docker @@ -36,4 +36,4 @@ if [ $result -ne 0 ]; then cat logs/LuaUPnP.log fi -exit $result \ No newline at end of file +exit $result diff --git a/readme.md b/readme.md index 63149e8..4105ee5 100644 --- a/readme.md +++ b/readme.md @@ -10,8 +10,8 @@ The docker image of openLuup is available from Docker Hub as [vwout/openluup](ht | Base image | Label | Layers | Vcs Revision | |------------|-------|--------|--------------| -| Debian stretch (slim) | [![](https://images.microbadger.com/badges/version/vwout/openluup:slim.svg)](https://microbadger.com/images/vwout/openluup:slim "Docker image version for Debian") | [![](https://images.microbadger.com/badges/image/vwout/openluup:slim.svg)](https://microbadger.com/images/vwout/openluup:slim "Docker image layers for Debian") | [![](https://images.microbadger.com/badges/commit/vwout/openluup:slim.svg)](https://microbadger.com/images/vwout/openluup:slim "Docker image git commit for Debian") | -| Alpine 3.8 | [![](https://images.microbadger.com/badges/version/vwout/openluup:alpine.svg)](https://microbadger.com/images/vwout/openluup:alpine "Docker image version for alpine") | [![](https://images.microbadger.com/badges/image/vwout/openluup:alpine.svg)](https://microbadger.com/images/vwout/openluup:alpine "Docker image layers for alpine") | [![](https://images.microbadger.com/badges/commit/vwout/openluup:alpine.svg)](https://microbadger.com/images/vwout/openluup:alpine "Docker image git commit for alpine") | +| Debian 10 'Buster' (slim) | [![](https://images.microbadger.com/badges/version/vwout/openluup:slim.svg)](https://microbadger.com/images/vwout/openluup:slim "Docker image version for Debian") | [![](https://images.microbadger.com/badges/image/vwout/openluup:slim.svg)](https://microbadger.com/images/vwout/openluup:slim "Docker image layers for Debian") | [![](https://images.microbadger.com/badges/commit/vwout/openluup:slim.svg)](https://microbadger.com/images/vwout/openluup:slim "Docker image git commit for Debian") | +| Alpine 3.11 | [![](https://images.microbadger.com/badges/version/vwout/openluup:alpine.svg)](https://microbadger.com/images/vwout/openluup:alpine "Docker image version for alpine") | [![](https://images.microbadger.com/badges/image/vwout/openluup:alpine.svg)](https://microbadger.com/images/vwout/openluup:alpine "Docker image layers for alpine") | [![](https://images.microbadger.com/badges/commit/vwout/openluup:alpine.svg)](https://microbadger.com/images/vwout/openluup:alpine "Docker image git commit for alpine") | ## Running To start openLuup, invoke docker and add options like volume mounts (see below) to your liking: