Skip to content

Commit b37f1ef

Browse files
authored
Merge pull request #1 from avkosme/arm
Add Apple Silicon Support
2 parents 4e4bb29 + 7ccb188 commit b37f1ef

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
FROM golang:1.18-alpine
1+
FROM arm64v8/golang:1.18-alpine3.15
22
LABEL org.opencontainers.image.source https://github.com/avkosme/hugo-dev
33

44
RUN apk add --no-cache git rsync sshpass hugo ansible npm openssh-client make g++ python3 curl py3-pip nftables openssl protoc
55
RUN ln -s /usr/bin/python3 /usr/bin/python
66
RUN git clone https://github.com/sshuttle/sshuttle.git && cd sshuttle/ && ./setup.py install
7+
RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.49.0
78
RUN git clone https://github.com/go-delve/delve && cd delve && go install github.com/go-delve/delve/cmd/dlv && go build -o /usr/bin/dvl cmd/dlv/main.go
8-
RUN go install github.com/golangci/golangci-lint/cmd/[email protected]
9+
910
RUN go install google.golang.org/protobuf/cmd/[email protected]
1011
RUN go install google.golang.org/grpc/cmd/[email protected]
1112
RUN go install golang.org/x/vuln/cmd/govulncheck@latest

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
build:
2-
docker build -t "ghcr.io/avkosme/hugo-dev" .
2+
docker build -t "ghcr.io/avkosme/hugo-dev:latest" .
33
push:
44
docker push ghcr.io/avkosme/hugo-dev:latest
5+
build.arm:
6+
docker build -t "ghcr.io/avkosme/hugo-dev:arm" .
7+
push.arm:
8+
docker push ghcr.io/avkosme/hugo-dev:arm
59

610

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ Use for dev, test, deploy
44

55
## Docker Pull Command
66

7+
✅ Native Apple Silicon Support
8+
9+
```
10+
$ docker pull ghcr.io/avkosme/hugo-dev:arm
11+
```
12+
713
```
814
$ docker pull ghcr.io/avkosme/hugo-dev:latest
915
```

0 commit comments

Comments
 (0)