add pr#84 changes - part 2

README.md

@@ -63,7 +63,6 @@ Check the [docs](docs/Deployments.md) for more documentation on the deployments.
 
 - [Address Resolver](cmd/address-resolver/README.md)
 - [Config Bootstrapper](cmd/config-bootstrapper/README.md)
-- [Liveness Checker](cmd/liveness-checker/README.md)
 - [Network Monitor](cmd/network-monitor/README.md)
 - [Public Visor Monitor](cmd/public-visor-monitor/README.md)
 - [Route Finder](cmd/route-finder/README.md)

docker/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.7"
-
 networks:
   srv:
     driver: "bridge"

docker/docker_build.sh

@@ -4,6 +4,7 @@ trap "exit" INT
 ## Variables
 image_tag="$1"
 go_buildopts="$2"
+build_arch="$3"
 git_branch="$(git rev-parse --abbrev-ref HEAD)"
 nv_dev_url="https://nv.skywire.dev/map"
 nv_prod_url="https://nv.skycoin.com/map"
@@ -15,7 +16,7 @@ platform="--platform=linux/amd64"
 registry="$REGISTRY"
 
 # shellcheck disable=SC2153
-base_image=golang:1.21-alpine
+base_image=golang:1.23-alpine
 
 if [[ "$#" != 2 ]]; then
   echo "docker_build.sh <IMAGE_TAG> <GO_BUILDOPTS>"
@@ -25,6 +26,10 @@ if [[ "$go_buildopts" == "" ]]; then
   go_buildopts="-mod=vendor -ldflags\"-w -s\""
 fi
 
+if [[ "$build_arch" != "" ]]; then
+  platform="--platform=$build_arch"
+fi
+
 if [[ "$git_branch" != "master" ]] && [[ "$git_branch" != "develop" ]]; then
   git_branch="develop"
 fi
@@ -65,13 +70,15 @@ if [[ "$image_tag" == "e2e" ]]; then
     --build-arg build_opts="$go_buildopts" \
     --build-arg image_tag="$image_tag" \
     --build-arg base_image="skycoin/dmsg-discovery:$dockerhub_image_tag" \
+    $platform \
     -t "$registry"/dmsg-discovery:"$image_tag" .
 
   echo "build dmsg server image"
   DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/dmsg-server/Dockerfile \
     --build-arg base_image="skycoin/dmsg-server:$dockerhub_image_tag" \
     --build-arg build_opts="$go_buildopts" \
     --build-arg image_tag="$image_tag" \
+    $platform \
     -t "$registry"/dmsg-server:"$image_tag" .
 
   echo "build service discovery image"
@@ -81,13 +88,6 @@ if [[ "$image_tag" == "e2e" ]]; then
     --build-arg image_tag="$image_tag" \
     $platform \
     -t "$registry"/service-discovery:"$image_tag" .
-
-  echo "building uptime tracker image"
-  DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/uptime-tracker/Dockerfile \
-  --build-arg base_image="$base_image" \
-  --build-arg build_opts="$go_buildopts" \
-  --build-arg image_tag="$image_tag" \
-  -t "$registry"/uptime-tracker:"$image_tag" .
 
   rm -rf ./tmp/skycoin-service-discovery
 fi
@@ -97,41 +97,36 @@ if [[ "$image_tag" == "integration" ]]; then
   rm -rf ./tmp/skycoin-service-discovery
   rm -rf ./tmp/dmsg
   rm -rf ./tmp/skywire
-  rm -rf ./tmp/skywire-ut
   cp -r ../skycoin-service-discovery ./tmp
   cp -r ../dmsg ./tmp
   cp -r ../skywire ./tmp
-  cp -r ../skywire-ut ./tmp
 
   echo ====================================================
   echo "BUILDING SKYWIRE VISOR"
 
   DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/skywire-visor/DockerfileInt \
+    $platform \
     -t "$registry"/skywire-visor:"$image_tag" .
 
   echo ============ Base images ready ======================
 
   echo "build dmsg discovery image"
   DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/dmsg-discovery/DockerfileInt \
+    $platform \
     -t "$registry"/dmsg-discovery:"$image_tag" .
 
   echo "build dmsg server image"
   DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/dmsg-server/DockerfileInt \
+    $platform \
     -t "$registry"/dmsg-server:"$image_tag" .
 
   echo "build service discovery image"
   DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/service-discovery/Dockerfile \
     --build-arg base_image="$base_image" \
     --build-arg build_opts="$go_buildopts" \
     --build-arg image_tag="$image_tag" \
+    $platform \
     -t "$registry"/service-discovery:"$image_tag" .
-
-  echo "building uptime tracker image"
-  DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/uptime-tracker/Dockerfile \
-  --build-arg base_image="$base_image" \
-  --build-arg build_opts="$go_buildopts" \
-  --build-arg image_tag="$image_tag" \
-  -t "$registry"/uptime-tracker:"$image_tag" .
 
   rm -rf ./tmp/*
 fi
@@ -176,7 +171,6 @@ DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/uptime-tracker/Dockerfil
   $platform \
   -t "$registry"/uptime-tracker:"$image_tag" .
 
-
 echo "build node visualizer image"
 DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/node-visualizer/Dockerfile \
   --build-arg base_image="$base_image" \
@@ -193,14 +187,6 @@ DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/network-monitor/Dockerfi
   $platform \
   -t "$registry"/network-monitor:"$image_tag" .
 
-echo "building liveness checker image"
-DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/liveness-checker/Dockerfile \
-  --build-arg base_image="$base_image" \
-  --build-arg build_opts="$go_buildopts" \
-  --build-arg image_tag="$image_tag" \
-  $platform \
-  -t "$registry"/liveness-checker:"$image_tag" .
-
 echo "building config bootstrapper image"
 DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/config-bootstrapper/Dockerfile \
   --build-arg base_image="$base_image" \

docker/docker_clean.sh

@@ -19,7 +19,6 @@ declare -a images_arr=(
   "skycoin/network-monitor:${image_tag}"
   "skycoin/node-visualizer:${image_tag}"
   "skycoin/config-bootstrapper:${image_tag}"
-  "skycoin/liveness-checker:${image_tag}"
   "skycoin/vpn-monitor:${image_tag}"
   "skycoin/public-visor-monitor:${image_tag}"
   "skycoin/dmsg-monitor:${image_tag}"

docker/docker_push.sh

@@ -23,7 +23,6 @@ declare -a images_arr=(
   "network-monitor"
   "node-visualizer"
   "config-bootstrapper"
-  "liveness-checker"
   "vpn-monitor"
   "public-visor-monitor"
   "dmsg-monitor"

docker/images/address-resolver/Dockerfile

@@ -1,7 +1,7 @@
 ARG base_image
 ARG image_tag
 
-FROM ${base_image} as builder
+FROM ${base_image} AS builder
 
 ARG build_opts
 
@@ -12,14 +12,14 @@ RUN go build "${build_opts}" -o /release/address-resolver \
     ./cmd/address-resolver
 
 
-FROM alpine as prod
+FROM alpine AS prod
 COPY --from=builder /release/address-resolver /release/address-resolver
 ENTRYPOINT ["/release/address-resolver"]
 
-FROM prod as test
+FROM prod AS test
 
 # OS image
-FROM alpine as e2e
+FROM alpine AS e2e
 
 COPY ./docker/common/install-prequisites.sh /release/install-prequisites.sh
 RUN sh -c /release/install-prequisites.sh cert-only \
@@ -28,6 +28,6 @@ RUN sh -c /release/install-prequisites.sh cert-only \
 COPY --from=builder /release/address-resolver /release/address-resolver
 ENTRYPOINT ["/release/address-resolver"]
 
-FROM e2e as integration
+FROM e2e AS integration
 
 FROM ${image_tag}

docker/images/config-bootstrapper/Dockerfile

@@ -1,7 +1,7 @@
 ARG image_tag
 ARG base_image
 
-FROM ${base_image} as builder
+FROM ${base_image} AS builder
 
 ARG build_opts
 
@@ -11,15 +11,15 @@ WORKDIR /skywire-services
 RUN go build "${build_opts}" -o /release/config-bootstrapper ./cmd/config-bootstrapper && \ 
     mv /skywire-services/docker/config/config.json /release/config.json
 
-FROM alpine as prod
+FROM alpine AS prod
 COPY --from=builder /release/config-bootstrapper /release/config-bootstrapper
 COPY --from=builder /release/config.json /release/config.json
 ENTRYPOINT ["/release/config-bootstrapper"]
 
-FROM prod as test
+FROM prod AS test
 
 # OS image
-FROM alpine as e2e
+FROM alpine AS e2e
 
 COPY ./docker/common/install-prequisites.sh /release/install-prequisites.sh
 RUN sh -c /release/install-prequisites.sh cert-only \
@@ -29,6 +29,6 @@ COPY --from=builder /release/config-bootstrapper /release/config-bootstrapper
 COPY --from=builder /release/config.json /release/config.json
 ENTRYPOINT ["/release/config-bootstrapper"]
 
-FROM e2e as integration
+FROM e2e AS integration
 
 FROM ${image_tag}

docker/images/dmsg-discovery/Dockerfile

@@ -1,10 +1,10 @@
 ARG image_tag
 ARG base_image
 
-FROM ${base_image} as prod
+FROM ${base_image} AS prod
 
-FROM ${base_image} as test
+FROM ${base_image} AS test
 # OS image
-FROM ${base_image} as e2e
+FROM ${base_image} AS e2e
 
 FROM ${image_tag}

docker/images/dmsg-discovery/DockerfileInt

@@ -1,9 +1,7 @@
-FROM golang:1.21-alpine AS builder
+FROM golang:1.23-alpine AS builder
 ARG CGO_ENABLED=0
 
 ENV CGO_ENABLED=${CGO_ENABLED} \
-	GOOS=linux  \
-	GOARCH=amd64 \
 	GO111MODULE=on
 
 COPY /tmp/dmsg /dmsg

docker/images/dmsg-monitor/Dockerfile

@@ -1,7 +1,7 @@
 ARG image_tag
 ARG base_image
 
-FROM ${base_image} as builder
+FROM ${base_image} AS builder
 
 ARG build_opts
 
@@ -10,16 +10,16 @@ WORKDIR /skywire-services
 
 RUN go build "${build_opts}" -o /release/dmsg-monitor ./cmd/dmsg-monitor
 
-FROM alpine as prod
+FROM alpine AS prod
 
 WORKDIR /release
 COPY --from=builder /release/dmsg-monitor /release/dmsg-monitor
 ENTRYPOINT ["/release/dmsg-monitor"]
 
-FROM prod as test
+FROM prod AS test
 
 # OS image
-FROM alpine as e2e
+FROM alpine AS e2e
 WORKDIR /release
 
 COPY ./docker/common/install-prequisites.sh /release/install-prequisites.sh
@@ -29,6 +29,6 @@ RUN sh -c /release/install-prequisites.sh cert-only \
 COPY --from=builder /release/dmsg-monitor /release/dmsg-monitor
 ENTRYPOINT ["/release/dmsg-monitor"]
 
-FROM e2e as integration
+FROM e2e AS integration
 
 FROM ${image_tag}

docker/images/dmsg-server/Dockerfile

@@ -1,10 +1,10 @@
 ARG image_tag
 ARG base_image
 
-FROM ${base_image} as prod
+FROM ${base_image} AS prod
 
-FROM ${base_image} as test
+FROM ${base_image} AS test
 # OS image
-FROM ${base_image} as e2e
+FROM ${base_image} AS e2e
 
 FROM ${image_tag}

docker/images/dmsg-server/DockerfileInt

@@ -1,9 +1,7 @@
-FROM golang:1.21-alpine AS builder
+FROM golang:1.23-alpine AS builder
 ARG CGO_ENABLED=0
 
 ENV CGO_ENABLED=${CGO_ENABLED} \
-	GOOS=linux  \
-	GOARCH=amd64 \
 	GO111MODULE=on
 
 COPY /tmp/dmsg /dmsg

docker/images/network-monitor/Dockerfile

@@ -1,7 +1,7 @@
 ARG image_tag
 ARG base_image
 
-FROM ${base_image} as builder
+FROM ${base_image} AS builder
 
 ARG build_opts
 
@@ -11,16 +11,16 @@ WORKDIR /skywire-services
 RUN go build "${build_opts}" -o /release/network-monitor ./cmd/network-monitor && \
     go build "${build_opts}" -o /release/vpn-client ./cmd/vpn-lite-client
 
-FROM alpine as prod
+FROM alpine AS prod
 WORKDIR /release
 COPY --from=builder /release/vpn-client /apps/vpn-client
 COPY --from=builder /release/network-monitor /release/network-monitor
 ENTRYPOINT ["/release/network-monitor"]
 
-FROM prod as test
+FROM prod AS test
 
 # OS image
-FROM alpine as e2e
+FROM alpine AS e2e
 WORKDIR /release
 
 COPY ./docker/common/install-prequisites.sh /release/install-prequisites.sh
@@ -31,6 +31,6 @@ COPY --from=builder /release/vpn-client /release/vpn-client
 COPY --from=builder /release/network-monitor /release/network-monitor
 ENTRYPOINT ["/release/network-monitor"]
 
-FROM e2e as integration
+FROM e2e AS integration
 
 FROM ${image_tag}