Skip to content

Commit

Permalink
remove dsps directory for building
Browse files Browse the repository at this point in the history
  • Loading branch information
Makoto Toriyama committed Jun 29, 2022
1 parent b8090e1 commit 7371ba0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 17 deletions.
2 changes: 1 addition & 1 deletion server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG DSPS_VERSION_ID=""
WORKDIR /go/src/github.com/dsps/server
COPY . .
RUN go install && go install github.com/Songmu/gocredits/cmd/gocredits
RUN make dsps/dsps-$(uname -o | sed 's/GNU\///')-$(uname -m) && mv dsps/dsps-$(uname -o | sed 's/GNU\///')-$(uname -m) /dsps.bin
RUN make dist/dsps-$(uname -o | sed 's/GNU\///')-$(uname -m) && mv dist/dsps-$(uname -o | sed 's/GNU\///')-$(uname -m) /dsps.bin

FROM alpine:3.12.3
# Add some utilities for convinience: gettext (contains envsubst), curl, jq
Expand Down
5 changes: 4 additions & 1 deletion server/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SHELL := /bin/bash

release_dir = dsps
release_dir = dist
go_module_files = go.mod go.sum
go_src_files = $(shell find . -type f -name '*.go')
build_deps = $(go_module_files) $(go_src_files) | $(release_dir)
Expand Down Expand Up @@ -34,6 +34,9 @@ generate:
go install github.com/golang/mock/mockgen
go generate ./...

$(release_dir):
mkdir -p $(release_dir)

$(release_dir)/dsps-Linux-x86_64: $(build_deps)
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o $@ -ldflags "-X main.BuildDist=linux-amd64" -ldflags $(ldflags) main.go

Expand Down
3 changes: 0 additions & 3 deletions server/dsps/.gitignore

This file was deleted.

12 changes: 0 additions & 12 deletions server/dsps/README.md

This file was deleted.

0 comments on commit 7371ba0

Please sign in to comment.