Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
switch to multi-stage docker build
  • Loading branch information
Vamshi Surabhi committed May 6, 2018
1 parent a3660a8 commit e407741
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 17 deletions.
25 changes: 18 additions & 7 deletions Dockerfile
@@ -1,18 +1,29 @@
FROM hasura/haskell-docker-packager:1.1
RUN apt-get update && apt-get install -y pkgconf libcurl4-openssl-dev libpq-dev \
FROM debian:jessie-20180426 as skor-builder
MAINTAINER vamshi@hasura.io

RUN apt-get update && apt-get install -y build-essential pkgconf libcurl4-openssl-dev libpq-dev \
&& rm -rf /var/lib/apt/lists/*

COPY ./src /skor/src
COPY Makefile /skor/
WORKDIR /skor
RUN make

FROM debian:jessie-20180426

RUN apt-get update && apt-get install -y libcurl3 libpq5 \
&& rm -rf /var/lib/apt/lists/*

ENV DBNAME "postgres"
ENV PGUSER "postgres"
ENV PGPASS "''"
ENV PGPASS "''"
ENV PGHOST "localhost"
ENV PGPORT 5432
ENV WEBHOOKURL "http://localhost:5000"
ENV LOG_LEVEL "2"

COPY ./src /skor/src
COPY --from=skor-builder /skor/build/skor /usr/bin/skor
COPY Makefile /skor/
WORKDIR /skor

RUN make

CMD "./build/skor" "host=${PGHOST} port=${PGPORT} dbname=${DBNAME} user=${PGUSER} password=${PGPASS}" ${WEBHOOKURL}
CMD "skor" "host=${PGHOST} port=${PGPORT} dbname=${DBNAME} user=${PGUSER} password=${PGPASS}" "${WEBHOOKURL}" "${LOG_LEVEL}"
8 changes: 2 additions & 6 deletions Makefile
Expand Up @@ -2,8 +2,7 @@ project := skor
current_dir := $(shell pwd)
registry := hasura
CPPFLAGS += $(shell pkg-config --cflags libpq)
packager_ver := 1.2
version := 1.3
version := 0.2
build_dir := $(current_dir)/build

skor: src/skor.c src/req.c
Expand All @@ -14,7 +13,4 @@ clean:
rm -rf build

image:
docker run --rm -v $(current_dir):/root/skor-src $(registry)/$(project)-packager:$(packager_ver) sh -c "make -C /root/skor-src/ skor > /dev/null && cp /root/skor-src/build/skor /root/skor && /build.sh skor" | docker import - $(registry)/$(project):$(version)

packager: skor-packager.df
docker build -t "$(registry)/$(project)-packager:$(packager_ver)" -f skor-packager.df .
docker build -t $(registry)/$(project):$(version) .
4 changes: 0 additions & 4 deletions skor-packager.df

This file was deleted.

0 comments on commit e407741

Please sign in to comment.