From f681e85e501bba341cec30ab785477bae87d42ad Mon Sep 17 00:00:00 2001
From: Alexander Zavorotynskiy <alexander@openreplay.com>
Date: Mon, 16 May 2022 15:01:12 +0200
Subject: [PATCH] fix(backend): removed temp Dockerfile from cmd dir

---
 backend/Dockerfile     |  5 ++--
 backend/build.sh       |  2 +-
 backend/cmd/Dockerfile | 59 ------------------------------------------
 3 files changed, 4 insertions(+), 62 deletions(-)
 delete mode 100644 backend/cmd/Dockerfile

diff --git a/backend/Dockerfile b/backend/Dockerfile
index b7a494f86..356b5e524 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -10,11 +10,12 @@ RUN go mod download
 
 
 FROM prepare AS build
+COPY cmd cmd
 COPY pkg pkg
-COPY services services
+COPY internal internal
 
 ARG SERVICE_NAME
-RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o service -tags musl openreplay/backend/services/$SERVICE_NAME
+RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o service -tags musl openreplay/backend/cmd/$SERVICE_NAME
 
 FROM alpine
 RUN apk add --no-cache ca-certificates
diff --git a/backend/build.sh b/backend/build.sh
index 2aed265cb..ef57b0887 100755
--- a/backend/build.sh
+++ b/backend/build.sh
@@ -21,7 +21,7 @@ check_prereq() {
 function build_service() {
     image="$1"
     echo "BUILDING $image"
-    docker build -t ${DOCKER_REPO:-'local'}/$image:${git_sha1} --platform linux/amd64 --build-arg SERVICE_NAME=$image -f ./cmd/Dockerfile .
+    docker build -t ${DOCKER_REPO:-'local'}/$image:${git_sha1} --platform linux/amd64 --build-arg SERVICE_NAME=$image .
     [[ $PUSH_IMAGE -eq 1 ]] && {
         docker push ${DOCKER_REPO:-'local'}/$image:${git_sha1}
     }
diff --git a/backend/cmd/Dockerfile b/backend/cmd/Dockerfile
deleted file mode 100644
index 6c6ec4c3b..000000000
--- a/backend/cmd/Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-FROM golang:1.18-alpine3.15 AS prepare
-
-RUN apk add --no-cache git openssh openssl-dev pkgconf gcc g++ make libc-dev bash
-
-WORKDIR /root
-
-COPY go.mod .
-COPY go.sum .
-RUN go mod download
-
-
-FROM prepare AS build
-COPY pkg pkg
-COPY internal internal
-COPY cmd cmd
-
-ARG SERVICE_NAME
-RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o service -tags musl openreplay/backend/cmd/$SERVICE_NAME
-
-FROM alpine AS entrypoint
-RUN apk add --no-cache ca-certificates
-
-ENV TZ=UTC \
-    FS_ULIMIT=1000 \
-    FS_DIR=/mnt/efs \
-    MAXMINDDB_FILE=/root/geoip.mmdb \
-    UAPARSER_FILE=/root/regexes.yaml \
-    HTTP_PORT=80 \
-    BEACON_SIZE_LIMIT=7000000 \
-    KAFKA_USE_SSL=true \
-    KAFKA_MAX_POLL_INTERVAL_MS=400000 \
-    REDIS_STREAMS_MAX_LEN=3000 \
-    TOPIC_RAW_WEB=raw \
-    TOPIC_RAW_IOS=raw-ios \
-    TOPIC_CACHE=cache \
-    TOPIC_ANALYTICS=analytics \
-    TOPIC_TRIGGER=trigger \
-    GROUP_SINK=sink \
-    GROUP_STORAGE=storage \
-    GROUP_DB=db \
-    GROUP_ENDER=ender \
-    GROUP_CACHE=cache \
-    AWS_REGION_WEB=eu-central-1 \
-    AWS_REGION_IOS=eu-west-1 \
-    AWS_REGION_ASSETS=eu-central-1 \
-    CACHE_ASSETS=true \
-    ASSETS_SIZE_LIMIT=6291456 \
-    FS_CLEAN_HRS=72 \
-    LOG_QUEUE_STATS_INTERVAL_SEC=60
-
-
-ARG SERVICE_NAME
-RUN if [ "$SERVICE_NAME" = "http" ]; then \
-  wget https://raw.githubusercontent.com/ua-parser/uap-core/master/regexes.yaml -O "$UAPARSER_FILE" &&\
-  wget https://static.openreplay.com/geoip/GeoLite2-Country.mmdb -O "$MAXMINDDB_FILE"; fi
-
-
-COPY --from=build /root/service /root/service
-ENTRYPOINT /root/service