Skip to content

Commit dd7d9ac

Browse files
committed
Add support for ARM, upgrade dinghy-http-proxy, add Makefile
1 parent f86f455 commit dd7d9ac

File tree

4 files changed

+34
-10
lines changed

4 files changed

+34
-10
lines changed

.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
version=2.6.2
2+
platforms=linux/amd64,linux/arm64

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM codekitchen/dinghy-http-proxy:2.6.2
1+
ARG version
2+
3+
FROM tripox/dinghy-http-proxy:${version}
24
LABEL image.authors="Benjamin Porter <[email protected]>" \
35
image.authors="Mathias Larsen <[email protected]>"
46

Makefile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
include .env
2+
3+
default: help
4+
5+
## help : Prints this help.
6+
.PHONY: help
7+
help :
8+
@sed -n 's/^##//p' Makefile
9+
10+
## builder : Create the builder.
11+
.PHONY: builder
12+
builder :
13+
docker buildx create --name dory --use
14+
15+
## build push : Build and push docker images.
16+
.PHONY: build push
17+
build push :
18+
docker buildx build --build-arg version=${version} --platform ${platforms} -t docker.io/tripox/dory-http-proxy:${version} . --push
19+
docker buildx build --build-arg version=${version} --platform ${platforms} -t docker.io/tripox/dory-http-proxy:latest . --push

README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# dory-http-proxy
22

3-
dory-http-proxy is the default http proxy for [dory](https://github.com/FreedomBen/dory)
3+
Forked from dinghy-http-proxy for SSL support. Not pushed upstream since the solution here is temporary.
44

5-
## Building and pushing
5+
### Build and push images
66

7-
Login, build, and push:
7+
Create the builder:
88

99
```bash
10-
$ DHP_VER=2.6.2.1
11-
$ docker login docker.io
12-
$ docker build -t docker.io/freedomben/dory-http-proxy:${DHP_VER} -t docker.io/freedomben/dory-http-proxy:latest .
13-
$ docker push docker.io/freedomben/dory-http-proxy:${DHP_VER}
14-
$ docker push docker.io/freedomben/dory-http-proxy:latest
15-
$ git tag "v${DHP_VER}" && git push --tags
10+
make builder
11+
```
12+
13+
Build and push images:
14+
15+
```bash
16+
make build push
1617
```

0 commit comments

Comments
 (0)