vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove volumes

Browse source
This commit is contained in:
Evan Cordell 2017-07-11 10:34:46 -04:00
parent 1ef2308e41
commit 8d07bbc7af
3 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Dockerfile
View file

@ -4,11 +4,7 @@ FROM quay.io/quay/quay-base:latest
WORKDIR $QUAYDIR WORKDIR $QUAYDIR
# Install python dependencies COPY requirements.txt requirements-tests.txt ./
RUN virtualenv --distribute venv \
&& venv/bin/pip install -r requirements.txt \
&& venv/bin/pip install -r requirements-tests.txt \
&& venv/bin/pip freeze
# Check python dependencies for the GPL # Check python dependencies for the GPL
# Due to the following bug, pip results must be piped to a file before grepping: # Due to the following bug, pip results must be piped to a file before grepping:
@ -17,23 +13,22 @@ RUN cat requirements.txt | grep -v "^-e" | awk -F'==' '{print $1}' | xargs venv/
test -z $(cat pipinfo.txt | grep GPL | grep -v LGPL) && \ test -z $(cat pipinfo.txt | grep GPL | grep -v LGPL) && \
rm pipinfo.txt rm pipinfo.txt
RUN virtualenv --distribute venv \
&& venv/bin/pip install -r requirements.txt \
&& venv/bin/pip install -r requirements-tests.txt \
&& venv/bin/pip freeze
# Install front-end dependencies # Install front-end dependencies
ADD package.json package.json # JS depedencies
ADD tsconfig.json tsconfig.json COPY yarn.lock ./
ADD webpack.config.js webpack.config.js RUN yarn install --ignore-engines
ADD yarn.lock yarn.lock
RUN yarn install --ignore-engines
# Add static files # JS compile
ADD static static COPY static static
COPY package.json tsconfig.json webpack.config.js tslint.json ./
# Run Webpack RUN yarn build \
RUN yarn build && jpegoptim static/img/**/*.jpg \
&& optipng -clobber -quiet static/img/**/*.png
# Optimize our images
ADD static/img static/img
RUN jpegoptim static/img/**/*.jpg
RUN optipng -clobber -quiet static/img/**/*.png
COPY . . COPY . .
@ -49,6 +44,8 @@ RUN mkdir -p /etc/my_init.d /etc/systlog-ng /usr/local/bin /etc/monit static/fon
&& cp .git/HEAD GIT_HEAD \ && cp .git/HEAD GIT_HEAD \
&& rm -rf /etc/service/syslog-forwarder && rm -rf /etc/service/syslog-forwarder
RUN ln -s $QUAYCONF /conf
# Cleanup any NPM-related stuff. # Cleanup any NPM-related stuff.
# RUN apt-get remove -y --auto-remove python-dev g++ libjpeg62-dev libevent-dev libldap2-dev libsasl2-dev libpq-dev libffi-dev libgpgme11-dev nodejs jpegoptim optipng w3m \ # RUN apt-get remove -y --auto-remove python-dev g++ libjpeg62-dev libevent-dev libldap2-dev libsasl2-dev libpq-dev libffi-dev libgpgme11-dev nodejs jpegoptim optipng w3m \
# && apt-get autoremove -y \ # && apt-get autoremove -y \

1
conf/init/copy_config_files.sh
View file

@ -4,7 +4,6 @@ QUAYCONF=${QUAYCONF:-"$QUAYPATH/conf"}
cd ${QUAYDIR:-"/"} cd ${QUAYDIR:-"/"}
ln -s /conf/stack/* -t $QUAYCONF/stack
if [ -e $QUAYCONF/stack/robots.txt ] if [ -e $QUAYCONF/stack/robots.txt ]
then then

2
quay-base.dockerfile
View file

@ -98,6 +98,6 @@ COPY external_libraries.py _init.py ./
RUN venv/bin/python -m external_libraries RUN venv/bin/python -m external_libraries
RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache
VOLUME ["$QUAYCONF/stack", "/conf/stack", "/conf/etcd", "/var/log", "/datastorage", "/tmp", "$QUAYCONF/etcd"] VOLUME ["/var/log", "/datastorage", "/tmp"]
EXPOSE 443 8443 80 EXPOSE 443 8443 80