fixes to curl commands

docker/docker-compose.yml

@@ -6,17 +6,37 @@ services:
       context: netdisco-postgresql
     volumes:
       - "./netdisco/pgdata:/var/lib/postgresql/data"
-#  netdisco-base:
+  netdisco-base:
-#    image: netdisco-base:latest
+    image: netdisco-base:latest
-#    build:
+    build:
-#      context: netdisco-base
+      context: netdisco-base
-#  netdisco-backend:
+  netdisco-backend:
-#    image: netdisco-backend:latest
+    image: netdisco-backend:latest
-#    build:
+    build:
-#      context: netdisco-backend
+      context: netdisco-backend
-#    volumes:
+    volumes:
-#      - "./netdisco/config:/home/netdisco/environments"
+      - "./netdisco/config:/home/netdisco/environments"
-#    depends_on:
+    depends_on:
-#      - netdisco-base
+      - netdisco-base
-#    links:
+    links:
-#      - netdisco-postgresql:db
+      - netdisco-postgresql:db
+  netdisco-web:
+    image: netdisco-web:latest
+    build:
+      context: netdisco-web
+    volumes:
+      - "./netdisco/config:/home/netdisco/environments"
+    depends_on:
+      - netdisco-base
+    links:
+      - netdisco-postgresql:db
+  netdisco-do:
+    image: netdisco-do:latest
+    build:
+      context: netdisco-do
+    volumes:
+      - "./netdisco/config:/home/netdisco/environments"
+    depends_on:
+      - netdisco-base
+    links:
+      - netdisco-postgresql:db

docker/netdisco-backend/Dockerfile

@@ -6,9 +6,9 @@ LABEL org.netdisco.maintainer="The Netdisco Project"
 LABEL org.netdisco.version=${TAG}
 
 WORKDIR $NETDISCO_HOME/netdisco-mibs
-RUN curl -s https://api.github.com/repos/netdisco/netdisco-mibs/tags | \
+RUN curl -sL https://api.github.com/repos/netdisco/netdisco-mibs/tags | \
   jq '.[]|.tarball_url|select(test("tarball/\\d+\\.\\d+$"))' | \
-  sort -rg | head -n1 | xargs -n1 curl -L | tar --strip-components=1 -zxf -
+  sort -rg | head -n1 | xargs -n1 curl -sL | tar --strip-components=1 -zxf -
 
 WORKDIR $NETDISCO_HOME
 ENTRYPOINT ["/home/netdisco/bin/netdisco-backend"]

docker/netdisco-base/Dockerfile

@@ -9,6 +9,7 @@ RUN bash -c 'mkdir -p /usr/share/man/man{1..8}' && \
     apt-get -yq update && \
     apt-get install -yq --no-install-recommends \
       build-essential \
+      ca-certificates \
       cpanminus \
       curl \
       git \

docker/netdisco-base/hooks/post_push

@@ -1,4 +1,4 @@
 #!/bin/bash
 for url in $(echo $BUILD_TRIGGERS | sed "s/,/ /g"); do
-  curl -X POST -H "Content-Type: application/json" --data "{ \"build\": true, \"source_name\": \"$SOURCE_BRANCH\" }" $url
+  curl -sL -X POST -H "Content-Type: application/json" --data "{ \"build\": true, \"source_name\": \"$SOURCE_BRANCH\" }" $url
 done