Skip to content

Commit

Permalink
modified: Dockerfile
Browse files Browse the repository at this point in the history
modified:   rootfs/run.sh
  • Loading branch information
casperklein committed Sep 28, 2019
1 parent def9cd2 commit 04bf0d3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ENV PACKAGES="apache2 curl"

# Install apache
RUN apt-get update \
&& apt-get -y install $PACKAGES
&& apt-get -y --no-install-recommends install $PACKAGES

# Copy root filesystem
COPY rootfs /
Expand Down
1 change: 1 addition & 0 deletions rootfs/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ fi
echo -ne "HTTP-Auth:\t"

# check if $user/$pass is supplied
# shellcheck disable=SC2154
if [ -n "$user" ] && [ -n "$pass" ] || [ -n "$auth" ]; then
# enable auth
sed -i 's;<Directory /html>;<Directory /foo>;' /etc/apache2/conf-available/z-custom-config.conf
Expand Down

0 comments on commit 04bf0d3

Please sign in to comment.