acme-client no longer available on alpine. switch to certbot

This commit is contained in:
Michael Brachmann 2019-09-05 09:54:50 -04:00
parent b01647a7f3
commit c8fcbe5955
5 changed files with 20 additions and 15 deletions

View file

@ -4,7 +4,7 @@
LABEL base.image="docker.mimirdb.info/alpine_oraclejdk8" LABEL base.image="docker.mimirdb.info/alpine_oraclejdk8"
LABEL version="0.3" LABEL version="0.3"
LABEL software="Vizier" LABEL software="Vizier"
LABEL software.version="0.2.20190610" LABEL software.version="0.2.20190905
LABEL description="an open source, provenance aware, iterative data cleaning tool" LABEL description="an open source, provenance aware, iterative data cleaning tool"
LABEL website="http://vizierdb.info" LABEL website="http://vizierdb.info"
LABEL sourcecode="https://github.com/VizierDB" LABEL sourcecode="https://github.com/VizierDB"

View file

@ -1,6 +1,6 @@
#run the containers #run the containers
#spark-master #spark-master
#kubectl run namenode --image=docker.mimirdb.info/spark-hadoop --replicas=1 --port=22 --port=6066 --port=7077 --port=8020 --port=8080 --port=50070 --env="MASTER=spark://namenode:7077" --env="SPARK_CONF_DIR=/conf" --env="SPARK_PUBLIC_DNS=127.0.0.1" --env="LD_LIBRARY_PATH=/usr/local/hadoop/lib/native/" --env="SPARK_EXECUTOR_MEMORY=8g" --env="SPARK_DAEMON_MEMORY=8g" --env="SPARK_DRIVER_MEMORY=8g" --env="SPARK_WORKER_MEMORY=8g" --env="HDFS_CONF_dfs_client_use_datanode_hostname=true" --env="AWS_ECS=false" --command /usr/local/spark-2.2.0-bin-without-hadoop/master.sh #kubectl run namenode --image=localhost:32000/spark-hadoop --replicas=1 --port=22 --port=6066 --port=7077 --port=8020 --port=8080 --port=50070 --env="MASTER=spark://namenode:7077" --env="SPARK_CONF_DIR=/conf" --env="SPARK_PUBLIC_DNS=127.0.0.1" --env="LD_LIBRARY_PATH=/usr/local/hadoop/lib/native/" --env="SPARK_EXECUTOR_MEMORY=8g" --env="SPARK_DAEMON_MEMORY=8g" --env="SPARK_DRIVER_MEMORY=8g" --env="SPARK_WORKER_MEMORY=8g" --env="HDFS_CONF_dfs_client_use_datanode_hostname=true" --env="AWS_ECS=false" --command /usr/local/spark-2.2.0-bin-without-hadoop/master.sh
kind: PersistentVolume kind: PersistentVolume
apiVersion: v1 apiVersion: v1
metadata: metadata:
@ -164,7 +164,7 @@ spec:
type: ClusterIP type: ClusterIP
--- ---
#spark-worker #spark-worker
#kubectl run $HOSTNAME --image=docker.mimirdb.info/spark-hadoop --replicas=2 --port=$WORKER_PORT --port=$DATANODE_PORT --env="SPARK_CONF_DIR=/conf" --env="SPARK_PUBLIC_DNS=127.0.0.1" --env="SPARK_WORKER_CORES=4" --env="SPARK_WORKER_PORT=$WORKER_PORT" --env="SPARK_WORKER_WEBUI_PORT=$WORKER_WEBUI_PORT" --env="LD_LIBRARY_PATH=/usr/local/hadoop/lib/native/" --env="HDFS_DATA_HOST=$HOSTNAME" --env="HDFS_HOST=spark-master" --env="HDFS_CONF_dfs_datanode_address=0.0.0.0:$DATANODE_PORT" --env="SPARK_EXECUTOR_MEMORY=8g" --env="SPARK_DAEMON_MEMORY=8g" --env="SPARK_DRIVER_MEMORY=8g" --env="SPARK_WORKER_MEMORY=8g" --env="HDFS_CONF_dfs_client_use_datanode_hostname=true" --env="AWS_ECS=false" --command /usr/local/spark-2.2.0-bin-without-hadoop/worker.sh #kubectl run $HOSTNAME --image=localhost:32000/spark-hadoop --replicas=2 --port=$WORKER_PORT --port=$DATANODE_PORT --env="SPARK_CONF_DIR=/conf" --env="SPARK_PUBLIC_DNS=127.0.0.1" --env="SPARK_WORKER_CORES=4" --env="SPARK_WORKER_PORT=$WORKER_PORT" --env="SPARK_WORKER_WEBUI_PORT=$WORKER_WEBUI_PORT" --env="LD_LIBRARY_PATH=/usr/local/hadoop/lib/native/" --env="HDFS_DATA_HOST=$HOSTNAME" --env="HDFS_HOST=spark-master" --env="HDFS_CONF_dfs_datanode_address=0.0.0.0:$DATANODE_PORT" --env="SPARK_EXECUTOR_MEMORY=8g" --env="SPARK_DAEMON_MEMORY=8g" --env="SPARK_DRIVER_MEMORY=8g" --env="SPARK_WORKER_MEMORY=8g" --env="HDFS_CONF_dfs_client_use_datanode_hostname=true" --env="AWS_ECS=false" --command /usr/local/spark-2.2.0-bin-without-hadoop/worker.sh
kind: Service kind: Service
apiVersion: v1 apiVersion: v1
metadata: metadata:
@ -296,7 +296,7 @@ spec:
storage: 1Gi storage: 1Gi
--- ---
#mimir #mimir
#kubectl run vizier-mimir --image=docker.mimirdb.info/vizier-mimir-spark --replicas=1 --port=9001 --port=33388 --expose --env="RESTORE_BACKUP=false" --env="PULL_MIMIR=false" --env="AWS_ACCESS_KEY_ID=AKIAJ7MLFSPYLYG47ARQ" --env="AWS_SECRET_ACCESS_KEY=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" --env="S3_BUCKET_NAME=vizier-data-test" #kubectl run vizier-mimir --image=localhost:32000/vizier-mimir-spark --replicas=1 --port=9001 --port=33388 --expose --env="RESTORE_BACKUP=false" --env="PULL_MIMIR=false" --env="AWS_ACCESS_KEY_ID=AKIAJ7MLFSPYLYG47ARQ" --env="AWS_SECRET_ACCESS_KEY=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" --env="S3_BUCKET_NAME=vizier-data-test"
kind: PersistentVolume kind: PersistentVolume
apiVersion: v1 apiVersion: v1
metadata: metadata:
@ -352,7 +352,7 @@ spec:
claimName: vizier-data-pv-claim claimName: vizier-data-pv-claim
containers: containers:
- name: vizier-mimir - name: vizier-mimir
image: docker.mimirdb.info/vizier-mimir-async-spark image: localhost:32000/vizier-mimir-async-spark
ports: ports:
- containerPort: 9001 - containerPort: 9001
- containerPort: 4041 - containerPort: 4041
@ -420,7 +420,7 @@ spec:
component: vizier-mimir component: vizier-mimir
--- ---
#api #api
#kubectl run vizier-api --image=docker.mimirdb.info/vizier-api-spark --replicas=1 --port=9001 --port=80 --port=443 --expose --env="APP_PATH=" --env="API_SERVER=localhost" --env="API_LOCAL_PORT=443" --env="API_PORT=443" --env="API_SCHEME=http" --env="AWS_ACCESS_KEY_ID=AKIAJ7MLFSPYLYG47ARQ" --env="AWS_SECRET_ACCESS_KEY=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" --env="S3_BUCKET_NAME=vizier-data-test" #kubectl run vizier-api --image=localhost:32000/vizier-api-spark --replicas=1 --port=9001 --port=80 --port=443 --expose --env="APP_PATH=" --env="API_SERVER=localhost" --env="API_LOCAL_PORT=443" --env="API_PORT=443" --env="API_SCHEME=http" --env="AWS_ACCESS_KEY_ID=AKIAJ7MLFSPYLYG47ARQ" --env="AWS_SECRET_ACCESS_KEY=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" --env="S3_BUCKET_NAME=vizier-data-test"
kind: Deployment kind: Deployment
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
metadata: metadata:
@ -441,7 +441,7 @@ spec:
claimName: vizier-data-pv-claim claimName: vizier-data-pv-claim
containers: containers:
- name: vizier-api - name: vizier-api
image: docker.mimirdb.info/vizier-api-async-spark image: localhost:32000/vizier-api-async-spark
ports: ports:
- containerPort: 80 - containerPort: 80
- containerPort: 9001 - containerPort: 9001
@ -497,7 +497,7 @@ spec:
component: vizier-api component: vizier-api
--- ---
#ui #ui
#kubectl run vizier-ui --image=docker.mimirdb.info/vizier-ui --replicas=1 --port=9001 --port=80 --port=443 --expose #kubectl run vizier-ui --image=localhost:32000/vizier-ui --replicas=1 --port=9001 --port=80 --port=443 --expose
kind: Deployment kind: Deployment
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
metadata: metadata:
@ -515,7 +515,7 @@ spec:
hostname: vizier-ui hostname: vizier-ui
containers: containers:
- name: vizier-ui - name: vizier-ui
image: docker.mimirdb.info/vizier-ui-async image: localhost:32000/vizier-ui-async
ports: ports:
- containerPort: 80 - containerPort: 80
- containerPort: 443 - containerPort: 443
@ -552,7 +552,7 @@ spec:
component: vizier-ui component: vizier-ui
--- ---
#analytics #analytics
#kubectl run vizier-analytics --image=docker.mimirdb.info/vizier-analytics --replicas=1 --port=9001 --port=80 --expose #kubectl run vizier-analytics --image=localhost:32000/vizier-analytics --replicas=1 --port=9001 --port=80 --expose
kind: Deployment kind: Deployment
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
metadata: metadata:
@ -569,7 +569,7 @@ spec:
spec: spec:
containers: containers:
- name: vizier-analytics - name: vizier-analytics
image: docker.mimirdb.info/vizier-analytics image: localhost:32000/vizier-analytics
ports: ports:
- containerPort: 80 - containerPort: 80
- containerPort: 443 - containerPort: 443

View file

@ -4,7 +4,7 @@ FROM docker.mimirdb.info/alpine_oraclejdk8_nginx
LABEL base.image="docker.mimirdb.info/alpine_oraclejdk8_nginx" LABEL base.image="docker.mimirdb.info/alpine_oraclejdk8_nginx"
LABEL version="0.3" LABEL version="0.3"
LABEL software="Vizier" LABEL software="Vizier"
LABEL software.version="0.2.20190610" LABEL software.version="0.2.20190905"
LABEL description="an open source, provenance aware, iterative data cleaning tool" LABEL description="an open source, provenance aware, iterative data cleaning tool"
LABEL website="http://vizierdb.info" LABEL website="http://vizierdb.info"
LABEL sourcecode="https://github.com/VizierDB" LABEL sourcecode="https://github.com/VizierDB"

View file

@ -1,6 +1,6 @@
FROM nginx:alpine FROM nginx:alpine
LABEL software.version="0.2.20190611" LABEL software.version="0.2.20190905"
EXPOSE 80 EXPOSE 80
EXPOSE 22 EXPOSE 22

View file

@ -4,7 +4,7 @@
LABEL base.image="docker.mimirdb.info/alpine_oraclejdk8_nginx" LABEL base.image="docker.mimirdb.info/alpine_oraclejdk8_nginx"
LABEL version="0.3" LABEL version="0.3"
LABEL software="Vizier" LABEL software="Vizier"
LABEL software.version="0.2.20190509" LABEL software.version="0.2.20190905"
ENV VIZIER_CONFIG="vizier_ecs.conf" ENV VIZIER_CONFIG="vizier_ecs.conf"
ENV VIZIER_DOMAIN="vizier.app" ENV VIZIER_DOMAIN="vizier.app"
@ -22,7 +22,12 @@ COPY nginx.conf /etc/nginx/nginx.conf
COPY mime.types /etc/nginx/mime.types COPY mime.types /etc/nginx/mime.types
COPY acme-client /etc/periodic/weekly/acme-client COPY acme-client /etc/periodic/weekly/acme-client
RUN apk add nginx nginx-mod-http-headers-more acme-client libressl openssh yarn supervisor git \ RUN wget https://dl.eff.org/certbot-auto \
&& mv certbot-auto /usr/local/bin/certbot-auto \
&& chown root /usr/local/bin/certbot-auto \
&& chmod 0755 /usr/local/bin/certbot-auto \
RUN apk add nginx nginx-mod-http-headers-more libressl openssh yarn supervisor git \
&& chmod +x /etc/periodic/weekly/acme-client \ && chmod +x /etc/periodic/weekly/acme-client \
&& rm /etc/nginx/conf.d/default.conf && rm /etc/nginx/conf.d/default.conf