Merge remote-tracking branch 'origin/dev' into dev

inexio · Jan 25, 2021 · 9356669 · 9356669
2 parents b86ff63 + 3048e07
commit 9356669
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
-FROM golang:latest
-
+FROM golang:latest AS build
 WORKDIR /go/src/thola
 COPY . .
-
-RUN go get -d -v .
 RUN go generate
-RUN go install -v .
+RUN CGO_ENABLED=0 go build -v -o thola .
+
+FROM alpine:latest
+COPY --from=build /go/src/thola/thola .
 
-ENTRYPOINT ["thola", "api"]
+ENTRYPOINT ["./thola", "api"]
diff --git a/test/testdata/docker-compose.yml b/test/testdata/docker-compose.yml
@@ -13,14 +13,14 @@ services:
       tholanetwork:
         ipv4_address: 172.20.0.7
   snmpsim1:
-    image: tandrup/snmpsim:latest
+    image: thola/snmpsim:latest
     volumes:
       - ${THOLA_TEST_SNMPRECDIR}:/usr/local/snmpsim/data/
     networks:
       tholanetwork:
         ipv4_address: 172.20.0.8
   snmpsim2:
-    image: tandrup/snmpsim:latest
+    image: thola/snmpsim:latest
     volumes:
       - ${THOLA_TEST_SNMPRECDIR}:/usr/local/snmpsim/data/
     networks: