Browse Source

Various fixes for docker, Fix links targets, Change dark mode background color

master
Apostolos Fanakis 5 years ago
parent
commit
00fde83506
  1. 111
      Dockerfile
  2. 45
      default.conf
  3. 14
      docker-compose.yml
  4. 4
      env/apella-guide.env
  5. 10
      makefile
  6. 8
      src/index.html

111
Dockerfile

@ -0,0 +1,111 @@
FROM alpine:3.10
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
ENV NGINX_VERSION 1.17.9
ENV NJS_VERSION 0.3.9
ENV PKG_RELEASE 1
RUN set -x \
# create nginx user/group first, to be consistent throughout docker variants
&& addgroup -g 101 -S nginx \
&& adduser -S -D -H -u 101 -h /var/cache/nginx -s /sbin/nologin -G nginx -g nginx nginx \
&& apkArch="$(cat /etc/apk/arch)" \
&& nginxPackages=" \
nginx=${NGINX_VERSION}-r${PKG_RELEASE} \
nginx-module-xslt=${NGINX_VERSION}-r${PKG_RELEASE} \
nginx-module-geoip=${NGINX_VERSION}-r${PKG_RELEASE} \
nginx-module-image-filter=${NGINX_VERSION}-r${PKG_RELEASE} \
nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-r${PKG_RELEASE} \
" \
&& case "$apkArch" in \
x86_64) \
# arches officially built by upstream
set -x \
&& KEY_SHA512="e7fa8303923d9b95db37a77ad46c68fd4755ff935d0a534d26eba83de193c76166c68bfe7f65471bf8881004ef4aa6df3e34689c305662750c0172fca5d8552a *stdin" \
&& apk add --no-cache --virtual .cert-deps \
openssl \
&& wget -O /tmp/nginx_signing.rsa.pub https://nginx.org/keys/nginx_signing.rsa.pub \
&& if [ "$(openssl rsa -pubin -in /tmp/nginx_signing.rsa.pub -text -noout | openssl sha512 -r)" = "$KEY_SHA512" ]; then \
echo "key verification succeeded!"; \
mv /tmp/nginx_signing.rsa.pub /etc/apk/keys/; \
else \
echo "key verification failed!"; \
exit 1; \
fi \
&& apk del .cert-deps \
&& apk add -X "https://nginx.org/packages/mainline/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" --no-cache $nginxPackages \
;; \
*) \
# we're on an architecture upstream doesn't officially build for
# let's build binaries from the published packaging sources
set -x \
&& tempDir="$(mktemp -d)" \
&& chown nobody:nobody $tempDir \
&& apk add --no-cache --virtual .build-deps \
gcc \
libc-dev \
make \
openssl-dev \
pcre-dev \
zlib-dev \
linux-headers \
libxslt-dev \
gd-dev \
geoip-dev \
perl-dev \
libedit-dev \
mercurial \
bash \
alpine-sdk \
findutils \
&& su nobody -s /bin/sh -c " \
export HOME=${tempDir} \
&& cd ${tempDir} \
&& hg clone https://hg.nginx.org/pkg-oss \
&& cd pkg-oss \
&& hg up ${NGINX_VERSION}-${PKG_RELEASE} \
&& cd alpine \
&& make all \
&& apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
&& abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
" \
&& cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \
&& apk del .build-deps \
&& apk add -X ${tempDir}/packages/alpine/ --no-cache $nginxPackages \
;; \
esac \
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
&& if [ -n "$tempDir" ]; then rm -rf "$tempDir"; fi \
&& if [ -n "/etc/apk/keys/abuild-key.rsa.pub" ]; then rm -f /etc/apk/keys/abuild-key.rsa.pub; fi \
&& if [ -n "/etc/apk/keys/nginx_signing.rsa.pub" ]; then rm -f /etc/apk/keys/nginx_signing.rsa.pub; fi \
# Bring in gettext so we can get `envsubst`, then throw
# the rest away. To do this, we need to install `gettext`
# then move `envsubst` out of the way so `gettext` can
# be deleted completely, then move `envsubst` back.
&& apk add --no-cache --virtual .gettext gettext \
&& mv /usr/bin/envsubst /tmp/ \
\
&& runDeps="$( \
scanelf --needed --nobanner /tmp/envsubst \
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
| sort -u \
| xargs -r apk info --installed \
| sort -u \
)" \
&& apk add --no-cache $runDeps \
&& apk del .gettext \
&& mv /tmp/envsubst /usr/local/bin/ \
# Bring in tzdata so users could set the timezones through the environment
# variables
&& apk add --no-cache tzdata \
# forward request and error logs to docker log collector
&& ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log
COPY default.conf /etc/nginx/conf.d/
EXPOSE 8000
STOPSIGNAL SIGTERM
CMD ["nginx", "-g", "daemon off;"]

45
default.conf

@ -0,0 +1,45 @@
server {
listen 8000;
server_name localhost;
#charset koi8-r;
#access_log /var/log/nginx/host.access.log main;
location / {
root /usr/share/nginx/html;
index index.html index.htm;
}
#error_page 404 /404.html;
# redirect server error pages to the static page /50x.html
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
#
#location ~ \.php$ {
# proxy_pass http://127.0.0.1;
#}
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
#
#location ~ \.php$ {
# root html;
# fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
# include fastcgi_params;
#}
# deny access to .htaccess files, if Apache's document root
# concurs with nginx's one
#
#location ~ /\.ht {
# deny all;
#}
}

14
docker-compose.yml

@ -2,17 +2,21 @@ version: '3.7'
services:
apella-guide:
image: nginx
build: ./
container_name: apella-guide
restart: always
env_file:
- ./env/apella-guide.env
ports:
- "8080:80"
# ports:
# - "8000:8000"
expose:
- "8000"
volumes:
- ./src/:/usr/share/nginx/html:ro
networks:
- janus_apella-net
# Networks in use
networks:
apella-net:
driver: bridge
janus_apella-net:
external: true

4
env/apella-guide.env

@ -0,0 +1,4 @@
VIRTUAL_HOST=guide.apella.tk
VIRTUAL_PORT=8000
LETSENCRYPT_HOST=guide.apella.tk
LETSENCRYPT_EMAIL=apotwohd@gmail.com

10
makefile

@ -0,0 +1,10 @@
build:
@docker-compose -p apella-guide build;
run:
@docker-compose -p apella-guide up -d
stop:
@docker-compose -p apella-guide down
clean-data:
@docker-compose -p apella-guide down -v
clean-images:
@docker rmi `docker images -q -f "dangling=true"`

8
src/index.html

@ -34,7 +34,7 @@
<a id="Metamask__9"></a>Metamask <span class="darkmode-ignore">🧐</span>
</h2>
<p class="has-line-data" data-line-start="11" data-line-end="12">
In order to use blockchain based, decentralized applications the user needs to setup a gateway for their browser to communicate with blockchain. This is where <a href="https://metamask.io/">Metamask</a> comes in.
In order to use blockchain based, decentralized applications the user needs to setup a gateway for their browser to communicate with blockchain. This is where <a href="https://metamask.io/" target="_blank">Metamask</a> comes in.
</p>
<p class="has-line-data" data-line-start="13" data-line-end="19">
<strong>
@ -110,7 +110,7 @@
<!-- Header "Visit Apella" -->
<h3 class="code-line" data-line-start=32 data-line-end=33 >
<a id="Visit_Apellahttpswwwapellatk_and_enjoy_free_uncensored_communication__32"></a>
Visit <a href="https://www.apella.tk">Apella</a> and enjoy free, uncensored communication <span class="darkmode-ignore">🥳</span>
Visit <a href="https://www.apella.tk" target="_blank">Apella</a> and enjoy free, uncensored communication <span class="darkmode-ignore">🥳</span>
</h3>
<div id="blank-space-in-the-end" style="height: 15vh"/>
@ -120,9 +120,9 @@
right: '32px',
left: 'unset',
time: '0.3s',
mixColor: '#fff',
mixColor: '#d7d6dc',
backgroundColor: '#fff',
buttonColorDark: '#100f2c',
buttonColorDark: '#282923',
buttonColorLight: '#fff',
saveInCookies: false,
label: '🌓',

Loading…
Cancel
Save