This commit is contained in:
Umputun
2018-06-30 12:40:59 -05:00
parent 60879e8c42
commit 65bd239778
3 changed files with 12 additions and 5 deletions
+1 -1
View File
@@ -27,11 +27,11 @@ RUN gometalinter --disable-all --deadline=300s --vendor --enable=vet --enable=ve
--enable=deadcode --enable=gosimple --enable=gas --exclude=test --exclude=mock --exclude=vendor ./...
RUN mkdir -p target && /script/coverage.sh
RUN if [ -z "$COVERALLS_TOKEN" ] ; then \
echo coverall not enabled ; \
else goveralls -coverprofile=.cover/cover.out -service=travis-ci -repotoken $COVERALLS_TOKEN; fi
# get revision from git. if DRONE_TAG presented use DRONE_* git env to make version
RUN \
version=$(git rev-parse --abbrev-ref HEAD)-$(git describe --abbrev=7 --always --tags)-$(date +%Y%m%d-%H:%M:%S) && \
echo "git version=$version" && \
+3 -3
View File
@@ -18,11 +18,11 @@ services:
max-file: "5"
ports:
- "8080:8080" # promary rest server
- "8080:8080" # primary rest server
- "8084:8084" # local oauth2 server
environment:
- USER # preset enviroment, UID on the host machine, i.e `id -u`
- USER # preset environment, UID on the host machine, i.e `id -u`
- REMARK_URL=http://127.0.0.1:8080
- SECRET=12345
- STORE_BOLT_PATH=/srv/var/db
@@ -30,7 +30,7 @@ services:
- DEBUG=true
- DEV_PASSWD=password
- AUTH_DEV=true # activate local oauth "dev"
- ADMIN=dev_user # set admin flag for local ouath2
- ADMIN=dev_user # set admin flag for default user on local ouath2
volumes:
- ./var:/srv/var
#- ./web:/srv/web # uncomment to map web directory directly. It will propagate local changes to container without redeploy
+8 -1
View File
@@ -8,4 +8,11 @@ sed -i "s|var baseurl = '[^']*';|var baseurl = '${REMARK_URL}';|g" /srv/web/*.ht
echo "start remark42 server"
/sbin/su-exec ${USER} /srv/remark
if [ -z "USER" ] ; then \
echo "No USER defined, runs under root!"
exec /srv/remark
else
echo "runs under ${USER}"
/sbin/su-exec ${USER} /srv/remark
fi