Few typo and ordering fixes
This commit is contained in:
parent
7970306105
commit
d117d3d236
@ -18,7 +18,7 @@ RUN \
|
|||||||
|
|
||||||
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 build-base git libjpeg-turbo-dev libxml2-dev libxslt-dev postgresql-dev python2-dev zlib-dev \
|
||||||
# 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
|
||||||
|
@ -14,7 +14,7 @@ RUN \
|
|||||||
|
|
||||||
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 build-base git postgresql-dev python2-dev py2-pip zlib-dev \
|
||||||
# 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
|
||||||
|
@ -24,7 +24,7 @@ RUN \
|
|||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
# Install build dependencies
|
# Install build dependencies
|
||||||
apk --no-cache add --virtual .deps git build-base py2-pip yarn \
|
apk --no-cache add --virtual .deps build-base git py2-pip yarn \
|
||||||
# Clone OpenMapKit
|
# Clone OpenMapKit
|
||||||
&& git clone --depth 1 https://github.com/AmericanRedCross/OpenMapKitServer /srv/openmapkit \
|
&& git clone --depth 1 https://github.com/AmericanRedCross/OpenMapKitServer /srv/openmapkit \
|
||||||
&& cd /srv/openmapkit \
|
&& cd /srv/openmapkit \
|
||||||
|
@ -3,9 +3,8 @@
|
|||||||
SOURCE_DIR=$(realpath $(dirname "${0}"))/pandora
|
SOURCE_DIR=$(realpath $(dirname "${0}"))/pandora
|
||||||
|
|
||||||
# Check prerequisites
|
# Check prerequisites
|
||||||
SCRIPT_DIR=$(realpath $(dirname "${0}"))
|
docker image ls | grep -q rabbitmq || $(realpath $(dirname "${0}"))/rabbitmq.sh
|
||||||
docker image ls | grep -q rabbitmq || ${SCRIPT_DIR}/rabbitmq.sh
|
docker image ls | grep -q postgres || $(realpath $(dirname "${0}"))/postgres.sh
|
||||||
docker image ls | grep -q postgres || ${SCRIPT_DIR}/postgres.sh
|
|
||||||
|
|
||||||
# Build Docker container
|
# Build Docker container
|
||||||
docker build -t pandora ${SOURCE_DIR}
|
docker build -t pandora ${SOURCE_DIR}
|
||||||
|
Loading…
Reference in New Issue
Block a user