From 390a04244155b0e362c1cdefe0fe035ebdcf134c Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Wed, 2 Mar 2022 22:00:15 +0000 Subject: [PATCH] Rename development Dockerfile and build script --- Taskfile.yml | 2 +- docker/{Dockerfile => Dockerfile.dev} | 4 ++-- docker/{build.sh => dev.sh} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename docker/{Dockerfile => Dockerfile.dev} (94%) rename docker/{build.sh => dev.sh} (100%) diff --git a/Taskfile.yml b/Taskfile.yml index ac286ae..2e3cf85 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -96,7 +96,7 @@ tasks: - ./docker/build.sh - ./web/package.json cmds: - - docker build -t {{.IMAGE_NAME}}:dev . -f docker/Dockerfile + - docker build -t {{.IMAGE_NAME}}:dev . -f docker/Dockerfile.dev - docker push {{.IMAGE_NAME}}:dev run: diff --git a/docker/Dockerfile b/docker/Dockerfile.dev similarity index 94% rename from docker/Dockerfile rename to docker/Dockerfile.dev index 1775bfb..07183db 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile.dev @@ -6,7 +6,7 @@ RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest FROM alpine RUN apk --no-cache add go nodejs yarn bash curl git git-perl tmux -ADD docker/build.sh / +ADD docker/dev.sh / RUN yarn global add @vue/cli ENV PATH="/root/.yarn/bin/:${PATH}" WORKDIR /src/web @@ -14,4 +14,4 @@ ADD web/package.json web/yarn.lock /src/web/ RUN yarn WORKDIR /src COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/ -CMD /build.sh +CMD /dev.sh diff --git a/docker/build.sh b/docker/dev.sh similarity index 100% rename from docker/build.sh rename to docker/dev.sh