Skip to content

Commit d9f10d4

Browse files
committed
misc: small fix or general refactoring i did not bother commenting
1 parent caee14f commit d9f10d4

4 files changed

Lines changed: 31 additions & 7 deletions

File tree

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
with:
1818
go-version: ${{ matrix.go-version }}
1919
- name: Run Tests and Build
20-
run: go test ./... && make
20+
run: go test ./... && make build

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
FROM golang
1+
FROM golang:1.22.2
2+
23
ADD . /go/src/github.com/evilsocket/arc
34
WORKDIR /go/src/github.com/evilsocket/arc
45
COPY sample_config.toml config.toml
5-
RUN make build
6+
7+
RUN go build -o build/arc cmd/arc/*.go
68
EXPOSE 8443
79
ENTRYPOINT ./build/arc -config config.toml

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@ SERVICE_LN_DIR=/etc/systemd/system
1010

1111
all: build
1212

13-
build: assets
13+
build: webui/compiled.go
1414
@mkdir -p build
1515
@go build $(FLAGS) -o build/$(TARGET) $(SRC_PATH)
1616

17-
assets: bindata
18-
@rm -rf webui/compiled.go
17+
webui/compiled.go: bindata
1918
@go-bindata -o webui/compiled.go -pkg webui webui/...
2019

2120
bindata:
22-
@go get -u github.com/jteeuwen/go-bindata/...
21+
@go install github.com/jteeuwen/go-bindata
2322

2423
test:
2524
@go test ./...

0 commit comments

Comments
 (0)