jacob1123/budgeteer
1
1
Fork 0
Code Issues 12 Pull Requests 1 Packages Releases 1 Wiki Activity

create-categories #79

Open
jacob1123 wants to merge 31 commits from create-categories into master
pull from: create-categories
merge into: jacob1123:master
Conversation 1 Commits 31 Files Changed 26 +9 -8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5d57045efb - Show all commits

11
docker/Dockerfile.dev
View File

@ -1,15 +1,16 @@
FROM alpine as godeps FROM ubuntu as godeps
RUN apk --no-cache add go RUN apt update && apt install -y golang && apt dist-upgrade -y
RUN go install github.com/kyleconroy/sqlc/cmd/sqlc@latest RUN go install github.com/sqlc-dev/sqlc/cmd/sqlc@latest
RUN go install github.com/go-task/task/v3/cmd/task@latest RUN go install github.com/go-task/task/v3/cmd/task@latest
RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
FROM alpine FROM ubuntu
RUN apk --no-cache add go nodejs yarn bash curl git git-perl RUN apt update && apt install -y golang nodejs yarn bash curl git && apt dist-upgrade -y
ENV PATH="/root/.yarn/bin/:${PATH}" ENV PATH="/root/.yarn/bin/:${PATH}"
WORKDIR /src/web WORKDIR /src/web
ADD web/package.json web/yarn.lock /src/web/ ADD web/package.json web/yarn.lock /src/web/
WORKDIR /src WORKDIR /src
VOLUME /go VOLUME /go
VOLUME /.cache VOLUME /.cache
RUN yarn
COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/ COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/

2
docker/dev.sh
View File

@ -2,6 +2,6 @@
tmux new-session -d -s watch 'cd web; yarn dev' tmux new-session -d -s watch 'cd web; yarn dev'
tmux split-window; tmux split-window;
tmux send 'task -w run' ENTER; tmux send 'go-task -w run' ENTER;
tmux split-window; tmux split-window;
tmux a; tmux a;