Disassembler/Spotter-VM
1
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Reorganize edge repo usage in Dockerfiles

Browse Source
This commit is contained in:
Disassembler 2018-01-11 11:10:12 +01:00
parent 489a5df07f
commit 89bf24d6cf
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ckan/Dockerfile
View File

@ -11,14 +11,14 @@ RUN \
RUN \ RUN \
# Install runtime dependencies # Install runtime dependencies
apk --no-cache add libjpeg-turbo libmagic libpq py2-pip zlib apk --no-cache add libjpeg-turbo libmagic libpq py2-pip zlib \
&& echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
&& apk --no-cache add geos \
&& sed -i '$ d' /etc/apk/repositories
RUN \ RUN \
# Install build dependencies # Install build dependencies
apk --no-cache add --virtual .deps git build-base libjpeg-turbo-dev libxml2-dev libxslt-dev postgresql-dev python2-dev zlib-dev \ apk --no-cache add --virtual .deps git build-base libjpeg-turbo-dev libxml2-dev libxslt-dev postgresql-dev python2-dev zlib-dev \
# Add edge/testing repository for postgis (geos) support
&& echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
&& apk --no-cache add geos \
# Hackfix for python find_library('c') call # Hackfix for python find_library('c') call
&& ln -s /lib/ld-musl-x86_64.so.1 /lib/libc.so.1 \ && ln -s /lib/ld-musl-x86_64.so.1 /lib/libc.so.1 \
# Install CKAN # Install CKAN

8
cts/Dockerfile
View File

@ -7,14 +7,14 @@ RUN \
RUN \ RUN \
# Install runtime dependencies # Install runtime dependencies
apk --no-cache add libpq zlib apk --no-cache add libpq zlib \
&& echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
&& apk --no-cache add geos \
&& sed -i '$ d' /etc/apk/repositories
RUN \ RUN \
# Install build dependencies # Install build dependencies
apk --no-cache add --virtual .deps git build-base postgresql-dev python2-dev py2-pip zlib-dev \ apk --no-cache add --virtual .deps git build-base postgresql-dev python2-dev py2-pip zlib-dev \
# Add edge/testing repository for postgis (geos) support
&& echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
&& apk --no-cache add geos \
# Install CTS # Install CTS
&& git clone --depth 1 https://github.com/theirc/CTS /srv/cts \ && git clone --depth 1 https://github.com/theirc/CTS /srv/cts \
# Force psycopg2 version update for compatibility with PostgreSQL 10 # Force psycopg2 version update for compatibility with PostgreSQL 10

5
gnuhealth/Dockerfile
View File

@ -3,7 +3,8 @@ MAINTAINER Disassembler <disassembler@dasm.cz>
RUN \ RUN \
# Install Python3 runtime # Install Python3 runtime
apk --no-cache add python3 apk --no-cache add python3 \
&& ln -s /usr/bin/python3 /usr/bin/python
RUN \ RUN \
# Install runtime XML dependencies # Install runtime XML dependencies
@ -23,8 +24,6 @@ RUN \
&& rm -f /tmp/gnuhealth.tgz \ && rm -f /tmp/gnuhealth.tgz \
# Clone Sao (Tryton web client) repository # Clone Sao (Tryton web client) repository
&& git clone -b 4.2 --single-branch --depth 1 https://github.com/tryton/sao /srv/gnuhealth/sao \ && git clone -b 4.2 --single-branch --depth 1 https://github.com/tryton/sao /srv/gnuhealth/sao \
# Symlink python binary
&& ln -s /usr/bin/python3 /usr/bin/python \
# Create OS user # Create OS user
&& addgroup -S -g 8008 gnuhealth \ && addgroup -S -g 8008 gnuhealth \
&& adduser -S -u 8008 -h /srv/gnuhealth -s /bin/bash -g gnuhealth -G gnuhealth gnuhealth \ && adduser -S -u 8008 -h /srv/gnuhealth -s /bin/bash -g gnuhealth -G gnuhealth gnuhealth \