diff --git a/Dockerfile b/Dockerfile index 1f0a7225..c38191ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ # Build backend binary file FROM golang:1.14.10-alpine3.12 AS be-builder -RUN apk add git gcc g++ libc-dev WORKDIR /go/src/github.com/mayswind/lab COPY . . +RUN docker/backend-build-pre-setup.sh +RUN apk add git gcc g++ libc-dev RUN VERSION=`grep '"version": ' package.json | awk -F ':' '{print $2}' | tr -d ' ' | tr -d ',' | tr -d '"'` \ && COMMIT_HASH=$(git rev-parse --short HEAD) \ && GOOS=linux \ @@ -13,9 +14,10 @@ RUN chmod +x lab # Build frontend files FROM node:12.19.0-alpine3.12 AS fe-builder -RUN apk add git WORKDIR /go/src/github.com/mayswind/lab COPY . . +RUN docker/frontend-build-pre-setup.sh +RUN apk add git RUN npm install && npm run build # Package docker image diff --git a/docker/backend-build-pre-setup.sh b/docker/backend-build-pre-setup.sh new file mode 100755 index 00000000..2d73eac7 --- /dev/null +++ b/docker/backend-build-pre-setup.sh @@ -0,0 +1,6 @@ +#!/bin/sh +CUR_DIR=$(dirname "$0"); + +if [ -x "${CUR_DIR}/custom-backend-pre-setup.sh" ]; then + "${CUR_DIR}"/custom-backend-pre-setup.sh +fi diff --git a/docker/frontend-build-pre-setup.sh b/docker/frontend-build-pre-setup.sh new file mode 100755 index 00000000..d13072cf --- /dev/null +++ b/docker/frontend-build-pre-setup.sh @@ -0,0 +1,6 @@ +#!/bin/sh +CUR_DIR=$(dirname "$0"); + +if [ -x "${CUR_DIR}/custom-frontend-pre-setup.sh" ]; then + "${CUR_DIR}"/custom-frontend-pre-setup.sh +fi