Skip to content

Commit

Permalink
Merge pull request #5 from coostax/fix_docker_not_running
Browse files Browse the repository at this point in the history
rework docker image
  • Loading branch information
coostax authored May 20, 2022
2 parents 5d320eb + b883108 commit 2d4331a
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 45 deletions.
46 changes: 1 addition & 45 deletions wallabag/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,65 +4,21 @@ FROM $BUILD_FROM

# Default ENV
ENV \
LANG="C.UTF-8" \
DEBIAN_FRONTEND="noninteractive" \
CURL_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" \
S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
S6_CMD_WAIT_FOR_SERVICES=1 \
BASHIO_VERSION=0.14.3 \
TEMPIO_VERSION=2021.09.0 \
S6_OVERLAY_VERSION=2.1.0.2 \
NODE_VERSION=16 \
WALLABAG_VERSION=2.4.3

# Set shell
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

# Base system
WORKDIR /usr/src
ARG BUILD_ARCH

# Setup base
# hadolint ignore=DL3008
# hadolint ignore=DL3008,DL4006
RUN \
set -x && \
apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
curl \
gnupg \
lsb-release \
openssl \
software-properties-common \
nginx \
mariadb-client \
tzdata \
locales \
gettext-base \
#common debian docker base instructions
&& mkdir -p /usr/share/man/man1 \
\
&& if [ "${BUILD_ARCH}" = "armv7" ]; then \
export S6_ARCH="arm"; \
elif [ "${BUILD_ARCH}" = "i386" ]; then \
export S6_ARCH="x86"; \
else \
export S6_ARCH="${BUILD_ARCH}"; \
fi \
\
&& curl -L -f -s "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.gz" \
| tar zxvf - -C / \
&& mkdir -p /etc/fix-attrs.d \
&& mkdir -p /etc/services.d \
\
&& curl -L -f -s -o /usr/bin/tempio \
"https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" \
&& chmod a+x /usr/bin/tempio \
\
&& mkdir -p /usr/src/bashio \
&& curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | tar -xzf - --strip 1 -C /usr/src/bashio \
&& mv /usr/src/bashio/lib /usr/lib/bashio \
&& rm -f /usr/bin/bashio \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
# Prepare install of nodeJS
&& curl 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key' | apt-key add - \
&& echo "deb https://deb.nodesource.com/node_${NODE_VERSION}.x $(lsb_release -cs) main" > /etc/apt/sources.list.d/nodesource.list \
Expand Down
Empty file modified wallabag/rootfs/etc/cont-init.d/nginx.sh
100644 → 100755
Empty file.
Empty file modified wallabag/rootfs/etc/cont-init.d/wallabag.sh
100644 → 100755
Empty file.
Empty file modified wallabag/rootfs/etc/services.d/nginx/finish
100644 → 100755
Empty file.
Empty file modified wallabag/rootfs/etc/services.d/nginx/run
100644 → 100755
Empty file.
Empty file modified wallabag/rootfs/etc/services.d/php-fpm/finish
100644 → 100755
Empty file.
Empty file modified wallabag/rootfs/etc/services.d/php-fpm/run
100644 → 100755
Empty file.

0 comments on commit 2d4331a

Please sign in to comment.