Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop to master #2

Merged
merged 7 commits into from
Oct 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dist: xenial
sudo: required
dist: trusty

language: go

Expand All @@ -10,8 +10,9 @@ env:
global:
- GO111MODULE=on
matrix:
- PGDB=9.6 RELEASE=true
- PGDB=10
- PGDB=9.6 RELEASE=true PGIS=2.4
- PGDB=10 PGIS=2.4
- PGDB=11 PGIS=2.5

before_install:
# setup postgresql
Expand All @@ -20,7 +21,7 @@ before_install:
- sudo -E service postgresql stop 9.4
- sudo -E service postgresql stop 9.5
- sudo -E service postgresql stop 9.6
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends $(travis_apt_get_options) install postgresql-$PGDB postgresql-client-$PGDB postgresql-$PGDB-postgis-2.4 postgresql-$PGDB-postgis-2.4-scripts
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends $(travis_apt_get_options) install postgresql-$PGDB postgresql-client-$PGDB postgresql-$PGDB-postgis-$PGIS postgresql-$PGDB-postgis-$PGIS-scripts
- sudo -E sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/*/main/pg_hba.conf
- sudo -E sed -i 's/port = 5433/port = 5432/' /etc/postgresql/*/main/postgresql.conf
- sudo -E service postgresql restart $PGDB
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
v5.2.0
----------
* Sync release with RapidPro 5.2
* Add PostgreSQL 11 tests

v2.0.1
----------
* update table references according to v5.2 schema, use wrapf for errors
Expand Down
20 changes: 20 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM golang:1.12.9-alpine3.9

WORKDIR /app

RUN apk update \
&& apk add --virtual build-deps gcc git \
&& rm -rf /var/cache/apk/*

RUN addgroup -S golang \
&& adduser -S -G golang golang

COPY . .

RUN go install -v ./cmd/...
RUN chown -R golang /app

USER golang

EXPOSE 8080
ENTRYPOINT ["rp-archiver"]
10 changes: 10 additions & 0 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: "3"

services:
indexer:
image: ${DOCKER_IMAGE_NAME:-ilhasoft/archiver}:${DOCKER_IMAGE_TAG:-latest}
build:
context: ..
dockerfile: ./docker/Dockerfile
ports:
- 8080:8000