diff --git a/.vscode/settings.json b/.vscode/settings.json index 8ffea0a..1f5fd50 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,6 +5,7 @@ "Номера", "Событие", "событиями", + "GOARCH", "gocarina", "gocsv" ] diff --git a/Dockerfile b/Dockerfile index 86676d2..5d3b861 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:latest RUN apk add --no-cache ca-certificates -COPY bin/pinned_message /usr/local/bin/pinned_message +COPY bin/pinned_message_linux_arm64 /usr/local/bin/pinned_message RUN chmod +x /usr/local/bin/pinned_message CMD ["/usr/local/bin/pinned_message"] diff --git a/Makefile b/Makefile index 67cd3a2..ddcf21b 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,12 @@ generate: run: go run ./cmd/pinned_message/main.go -build: - go build -o bin/pinned_message cmd/pinned_message/main.go +build-macos: + rm -rf bin CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -o bin/pinned_message_macos_arm64 cmd/pinned_message/main.go + +build-linux: + rm -rf bin + docker run --rm -v "$$PWD":/app -w /app golang:1.22-alpine sh -c \ + "apk add --no-cache gcc musl-dev && \ + CGO_ENABLED=1 GOOS=linux GOARCH=arm64 go build -o bin/pinned_message_linux_arm64 cmd/pinned_message/main.go" diff --git a/bin/pinned_message b/bin/pinned_message_linux_arm64 similarity index 62% rename from bin/pinned_message rename to bin/pinned_message_linux_arm64 index 33c7c01..053b4af 100755 Binary files a/bin/pinned_message and b/bin/pinned_message_linux_arm64 differ diff --git a/bin/pinned_message_macos_arm64 b/bin/pinned_message_macos_arm64 deleted file mode 100755 index 33c7c01..0000000 Binary files a/bin/pinned_message_macos_arm64 and /dev/null differ diff --git a/docker-compose.yml b/docker-compose.yml index 6714657..79cac76 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,5 @@ services: context: . dockerfile: Dockerfile ports: - - "8080:8080" -# environment: -# - ENV_VAR_NAME=env_var_value + - "8210:8210" + - "8220:8220"