From 7b7db86edf6db2efb91b15537a71250230c10e9c Mon Sep 17 00:00:00 2001 From: Neil Schark <neil.schark@h-da.de> Date: Tue, 5 Mar 2024 16:14:01 +0000 Subject: [PATCH] wip --- controller/controller.Dockerfile | 56 +++++++++++++++++----------- controller/start_controller_later.sh | 23 ++++++++++-- 2 files changed, 54 insertions(+), 25 deletions(-) diff --git a/controller/controller.Dockerfile b/controller/controller.Dockerfile index c42772e53..e93b5297b 100644 --- a/controller/controller.Dockerfile +++ b/controller/controller.Dockerfile @@ -1,27 +1,39 @@ -ARG GOLANG_VERSION=1.22 -ARG BUILDARGS -ARG GITLAB_PROXY +#ARG GOLANG_VERSION=1.22 +#ARG BUILDARGS +#ARG GITLAB_PROXY +# +#FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bookworm as builder +#WORKDIR /gosdn/ +#COPY . . +#RUN --mount=type=cache,target=/root/go/pkg/mod \ +# --mount=type=cache,target=/root/.cache/go-build \ +# make build-gosdn +# +#FROM ${GITLAB_PROXY}debian:bookworm-slim +#WORKDIR /app/ +#RUN mkdir -p controller/configs/ +# +#COPY --from=builder /gosdn/artifacts/gosdn ./gosdn +# +#COPY --from=builder /gosdn/controller/configs/development-gosdn.toml.example ./configs/development-gosdn.toml +#COPY --from=builder /gosdn/controller/configs/integration-test-gosdn.toml ./configs/integration-test-gosdn.toml +#COPY --from=builder /gosdn/controller/configs/containerlab-gosdn.toml.example ./configs/containerlab-gosdn.toml +#COPY --from=builder /gosdn/controller/configs/gNMISubscriptions.txt.example ./configs/gNMISubscriptions.txt +# +#COPY controller/start_controller_later.sh . +#RUN chmod +x start_controller_later.sh +# +#EXPOSE 55055 8080 40000 +#ENTRYPOINT ["./gosdn"] -FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bookworm as builder -WORKDIR /gosdn/ -COPY . . -RUN --mount=type=cache,target=/root/go/pkg/mod \ - --mount=type=cache,target=/root/.cache/go-build \ - make build-gosdn +FROM debian:bookworm-slim -FROM ${GITLAB_PROXY}debian:bookworm-slim -WORKDIR /app/ -RUN mkdir -p controller/configs/ +RUN apt-get update && apt-get install -y curl bash wget nmap dnsutils -COPY --from=builder /gosdn/artifacts/gosdn ./gosdn +WORKDIR /app -COPY --from=builder /gosdn/controller/configs/development-gosdn.toml.example ./configs/development-gosdn.toml -COPY --from=builder /gosdn/controller/configs/integration-test-gosdn.toml ./configs/integration-test-gosdn.toml -COPY --from=builder /gosdn/controller/configs/containerlab-gosdn.toml.example ./configs/containerlab-gosdn.toml -COPY --from=builder /gosdn/controller/configs/gNMISubscriptions.txt.example ./configs/gNMISubscriptions.txt +COPY controller/start_controller_later.sh ./run.sh +RUN chmod +x run.sh -COPY controller/start_controller_later.sh . -RUN chmod +x start_controller_later.sh - -EXPOSE 55055 8080 40000 -ENTRYPOINT ["./gosdn"] +EXPOSE 1337 +ENTRYPOINT [ "/app/run.sh" ] diff --git a/controller/start_controller_later.sh b/controller/start_controller_later.sh index f233559a7..cfcf14d2c 100644 --- a/controller/start_controller_later.sh +++ b/controller/start_controller_later.sh @@ -1,6 +1,23 @@ #!/bin/sh -echo "Starting controller later" +#echo "Starting controller later" +#sleep 20 +#echo "Starting controller now" +#./gosdn + +#!/bin/bash + sleep 20 -echo "Starting controller now" -./gosdn + + +#ls -la + +echo ------------------------------------ + +nmap -p 5672 rabbitmq + +echo ------------------------------------ + +nslookup rabbitmq + +echo ------------------------------------ -- GitLab