Unify ODK Build naming and nginx configuration for spotter-appmgr

opendatakit-build.sh

@@ -24,9 +24,5 @@ cp ${SOURCE_DIR}/etc/init.d/opendatakit-build /etc/init.d/opendatakit-build
 rc-update add opendatakit-build
 service opendatakit-build start
 
-# Create nginx app definition
+# Add application definition
-cp ${SOURCE_DIR}/etc/nginx/conf.d/opendatakit-build.conf /etc/nginx/conf.d/opendatakit-build.conf
+spotter-appmgr add-app opendatakit-build "https://opendatakit-build.{host}/"
-service nginx reload
-
-# Add portal application definition
-portal-app-manager opendatakit-build "https://{host}:8417/"

opendatakit-build/Dockerfile

@@ -50,6 +50,6 @@ RUN \
 
 COPY docker/ /
 
-EXPOSE 8017
+EXPOSE 8080
 
 CMD ["s6-svscan", "/etc/services.d"]

opendatakit-build/docker/etc/services.d/odkbuild/run

@@ -3,4 +3,4 @@
 cd /srv/odkbuild
 fdmove -c 2 1
 s6-setuidgid 8017:8017
-bundle exec rackup config.ru -o 0.0.0.0 -p 8017
+bundle exec rackup config.ru -o 0.0.0.0 -p 8080

opendatakit-build/etc/init.d/opendatakit-build

@@ -12,11 +12,14 @@ start() {
 	--name opendatakit-build \
 	-h opendatakit-build \
 	--link postgres \
-	-p 127.0.0.1:8017:8017 \
 	-v /srv/opendatakit-build/conf/config.yml:/srv/odkbuild/config.yml \
 	opendatakit-build
 }
 
+start_post() {
+	/usr/local/bin/spotter-appmgr update-hosts opendatakit-build
+}
+
 stop() {
 	/usr/bin/docker stop opendatakit-build
 }

opendatakit-build/etc/nginx/conf.d/opendatakit-build.conf

@@ -1,11 +0,0 @@
-server {
-    listen [::]:8817 ipv6only=off;
-    listen [::]:8417 ssl http2 ipv6only=off;
-
-    access_log /var/log/nginx/opendatakit-build.access.log;
-    error_log /var/log/nginx/opendatakit-build.error.log;
-
-    location / {
-        proxy_pass http://127.0.0.1:8017;
-    }
-}