bug fixes and updates

master
Michael Brachmann 2019-09-18 11:11:50 -04:00
parent af02ad4040
commit 5794a79547
6 changed files with 25 additions and 22 deletions

View File

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

View File

@ -2,9 +2,9 @@ FROM docker.mimirdb.info/alpine_oraclejdk8_nginx
# Metadata
LABEL base.image="docker.mimirdb.info/alpine_oraclejdk8_nginx"
LABEL version="0.3"
LABEL version="0.4"
LABEL software="Vizier"
LABEL software.version="0.2.20190905"
LABEL software.version="0.2.20190918"
LABEL description="an open source, provenance aware, iterative data cleaning tool"
LABEL website="http://vizierdb.info"
LABEL sourcecode="https://github.com/VizierDB"
@ -27,6 +27,20 @@ ENV DATA_STAGING_TYPE=s3
EXPOSE 33388
EXPOSE 22
ENV IAM_ROLE=none
ENV AWS_ACCESS_KEY_ID=value
ENV AWS_SECRET_ACCESS_KEY=value
ENV USE_S3_VOLUME=true
ENV S3_ENDPOINT=
ENV S3A_ENDPOINT="https://s3.vizier.app/"
ENV S3_BUCKET_ACL=private
ENV S3_BUCKET_NAME=none
ENV MOUNT_POINT=/usr/local/source/web-api/vizier/.vizierdb
ENV MIMIR_HOST="vizier-mimir.local"
ENV MIMIR_DATA_DIR="/usr/local/source/web-api/vizier/.vizierdb/mimir"
ARG S3FS_VERSION=v1.82
RUN echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
&& apk add --update \
build-base alpine-sdk \
@ -42,21 +56,9 @@ RUN echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/
openssh \
supervisor \
&& rm /var/cache/apk/* \
&& mkdir -p /usr/local/source/web-api/.vizierdb
&& mkdir -p $MOUNT_POINT
ENV IAM_ROLE=none
ENV AWS_ACCESS_KEY_ID=value
ENV AWS_SECRET_ACCESS_KEY=value
ENV USE_S3_VOLUME=true
ENV S3_ENDPOINT=
ENV S3A_ENDPOINT="https://s3.vizier.app/"
ENV S3_BUCKET_ACL=private
ENV S3_BUCKET_NAME=none
ENV MOUNT_POINT=/usr/local/source/web-api/.vizierdb
ENV MIMIR_HOST="vizier-mimir.local"
ENV MIMIR_DATA_DIR="/usr/local/source/web-api/.vizierdb/mimir"
ARG S3FS_VERSION=v1.82
RUN git clone https://github.com/s3fs-fuse/s3fs-fuse.git && \
cd s3fs-fuse \

View File

@ -31,8 +31,8 @@ if [ "$USE_S3_VOLUME" == "true" ]; then
fi
#mk mimir data dir if it doesn't exist
mkdir -p /usr/local/source/web-api/.vizierdb/mimir
mkdir -p /usr/local/source/web-api/.vizierdb/logs
mkdir -p $MIMIR_DATA_DIR
mkdir -p "$MOUNT_POINT/logs"
#update mimir from repo
if [ $PULL_MIMIR == "true" ]

1
remove-volumes.sh Executable file
View File

@ -0,0 +1 @@
sudo docker volume rm hdfs-data hdfs-data-0 hdfs-data-1 spark-data spark-data-0 spark-data-1 spark-scratch-0 spark-scratch-1 vizier-data

View File

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

View File

@ -2,9 +2,9 @@
# Metadata
LABEL base.image="docker.mimirdb.info/alpine_oraclejdk8_nginx"
LABEL version="0.3"
LABEL version="0.4"
LABEL software="Vizier"
LABEL software.version="0.2.20190905"
LABEL software.version="0.2.20190918"
ENV VIZIER_CONFIG="vizier_ecs.conf"
ENV VIZIER_DOMAIN="vizier.app"