Skip to content

Commit

Permalink
fix eol
Browse files Browse the repository at this point in the history
  • Loading branch information
mikoj committed Mar 14, 2019
1 parent 23a4ab1 commit 6f5eef6
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 33 deletions.
66 changes: 34 additions & 32 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
FROM debian:stretch

LABEL maintainer "[email protected]"

ENV DEBIAN_FRONTEND noninteractive

RUN \
apt-get update && \
apt-get -y install apt-transport-https curl gnupg psmisc && \
curl -L https://packagecloud.io/varnishcache/varnish60/gpgkey | apt-key add - && \
touch /etc/apt/sources.list.d/varnishcache_varnish60.list && \
echo 'deb https://packagecloud.io/varnishcache/varnish60/debian/ stretch main' > /etc/apt/sources.list.d/varnishcache_varnish60.list && \
echo 'deb-src https://packagecloud.io/varnishcache/varnish60/debian/ stretch main' >> /etc/apt/sources.list.d/varnishcache_varnish60.list && \
apt-get update && \
apt-get -y install varnish=6.0.0-1~stretch && \
rm -rf /var/lib/apt/lists/*

WORKDIR /

ADD start_varnishd.sh /start.sh

ENV VARNISH_MALLOC '256m'
ENV VARNISH_LOG 1
ENV VARNISH_LOG_FORMAT '%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-agent}i" %{Varnish:hitmiss}x'

RUN ln -sf /dev/stdout /var/log/varnish/access.log

EXPOSE 80 6082

RUN chmod +x /start.sh
# Start the varnishd
ENTRYPOINT ["./start.sh"]
FROM debian:stretch

LABEL maintainer "[email protected]"

ENV DEBIAN_FRONTEND noninteractive

RUN \
apt-get update && \
apt-get -y install apt-transport-https curl gnupg psmisc && \
curl -L https://packagecloud.io/varnishcache/varnish60/gpgkey | apt-key add - && \
touch /etc/apt/sources.list.d/varnishcache_varnish60.list && \
echo 'deb https://packagecloud.io/varnishcache/varnish60/debian/ stretch main' > /etc/apt/sources.list.d/varnishcache_varnish60.list && \
echo 'deb-src https://packagecloud.io/varnishcache/varnish60/debian/ stretch main' >> /etc/apt/sources.list.d/varnishcache_varnish60.list && \
apt-get update

RUN \
apt-get -y install varnish=6.0.0-1~stretch && \
rm -rf /var/lib/apt/lists/*

WORKDIR /

ADD start_varnishd.sh /start.sh

ENV VARNISH_MALLOC '256m'
ENV VARNISH_LOG 1
ENV VARNISH_LOG_FORMAT '%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-agent}i" %{Varnish:hitmiss}x'

RUN ln -sf /dev/stdout /var/log/varnish/access.log

EXPOSE 80 6082

RUN chmod +x /start.sh
# Start the varnishd
ENTRYPOINT ["./start.sh"]
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Grzegorz Synowiec
Copyright (c) 2018 Grzegorz Mikoj Synowiec

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 1 addition & 0 deletions start_varnishd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ if [ $VARNISH_LOG -eq 1 ]; then
/usr/bin/varnishncsa -D -a -F "$VARNISH_LOG_FORMAT" -w /var/log/varnish/access.log 2>&1 &
fi

echo "Starting varnishd"
/usr/sbin/varnishd -F -a :80 -T :6082 -f /etc/varnish/default.vcl -s malloc,${VARNISH_MALLOC} 2>&1 &

VARNISHD_PID=$!
Expand Down

0 comments on commit 6f5eef6

Please sign in to comment.