From d55dffcb77124df13a7bde1b560f95bdd7d2bb95 Mon Sep 17 00:00:00 2001 From: its-a-feature Date: Sun, 28 Jan 2024 13:47:49 -0800 Subject: [PATCH] getting ready for merge --- .github/workflows/docker.yml | 1 + mythic-docker/Dockerfile | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index afaa4c456..467910abd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -10,6 +10,7 @@ on: push: branches: - 'docker_updates' + - 'master' tags: - "v*.*.*" diff --git a/mythic-docker/Dockerfile b/mythic-docker/Dockerfile index 57b2b667b..bf0f5c2ed 100644 --- a/mythic-docker/Dockerfile +++ b/mythic-docker/Dockerfile @@ -1,26 +1,26 @@ -#FROM ghcr.io/its-a-feature/mythic_server:v0.0.2.32 +FROM ghcr.io/its-a-feature/mythic_server:v0.0.2.32 -FROM itsafeaturemythic/mythic_go_base:latest +#FROM itsafeaturemythic/mythic_go_base:latest -WORKDIR /usr/src/app +#WORKDIR /usr/src/app -ARG GOPROXY=proxy.golang.org -ARG GO111MODULE +#ARG GOPROXY=proxy.golang.org +#ARG GO111MODULE -RUN go env -w GOPROXY=${GOPROXY} -RUN go env -w GO111MODULE=${GO111MODULE} +#RUN go env -w GOPROXY=${GOPROXY} +#RUN go env -w GO111MODULE=${GO111MODULE} -COPY ["src/", "."] +#COPY ["src/", "."] -RUN make build_final +#RUN make build_final -FROM alpine +#FROM alpine -COPY --from=0 /mythic_server /mythic_server +#COPY --from=0 /mythic_server /mythic_server -WORKDIR /usr/src/app +#WORKDIR /usr/src/app -HEALTHCHECK --interval=60s --timeout=10s --retries=5 --start-period=20s \ - CMD wget -SqO - http://127.0.0.1:${MYTHIC_SERVER_PORT:-17443}/health || exit 1 +#HEALTHCHECK --interval=60s --timeout=10s --retries=5 --start-period=20s \ +# CMD wget -SqO - http://127.0.0.1:${MYTHIC_SERVER_PORT:-17443}/health || exit 1 -CMD ["/bin/sh", "-c", "cp /mythic_server . && ./mythic_server" ] \ No newline at end of file +#CMD ["/bin/sh", "-c", "cp /mythic_server . && ./mythic_server" ] \ No newline at end of file