Skip to content

Commit ef41511

Browse files
committed
Use docker-compose to test build
1 parent 9672072 commit ef41511

File tree

4 files changed

+40
-46
lines changed

4 files changed

+40
-46
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ dev-run: dev-docker-build
120120
TAG=$(TAG)-dev docker-compose up
121121

122122
dev-shell: dev-docker-build
123-
-docker rm -f proxmox-backup
124-
docker run --name=proxmox-backup -it --tmpfs /run --rm $(REGISTRY):$(TAG)-dev /bin/bash
123+
TAG=$(TAG)-dev docker-compose run --rm pbs bash
125124

126125
# Version management
127126

PROCESS.md

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
1+
# Upgrade to new release
2+
13
## My own release procedure
24

35
```bash
46
# Fork the build
57
make fork-version NEW_VERSION=2.3.2 NEW_SHA=e6120a8f6ff36f627a4da3a1a51a1e47231f5cc8
68

79
# Try to naively apply patches
10+
# Fix patches until it succeeds
811
make tmp-env
912
make tmp-env-client
1013

1114
# Try to naively compile first
1215
cd tmp/v2.3.2/proxmox-backup
1316
cargo build
1417

15-
# Try to compile first locally
18+
# Try to run dev build first
19+
make dev-run
20+
21+
# Try to compile first locally
1622
make amd64-docker-build
1723
make amd64-client
1824

@@ -21,4 +27,31 @@ make github-pre-release
2127

2228
# Mark the current version as latest
2329
make github-latest-release
24-
```
30+
```
31+
32+
## Build on your own
33+
34+
Refer to [PROESS.md](PROCESS.md).
35+
36+
```bash
37+
make dev-build
38+
```
39+
40+
It builds on any platform, which can be: `amd64`, `arm32v7`, `arm64v8`,
41+
etc. Wait a around 1-3h to compile.
42+
43+
Then you can push to your registry:
44+
45+
```bash
46+
make dev-push
47+
```
48+
49+
Or run locally:
50+
51+
```bash
52+
make dev-shell
53+
make dev-run
54+
```
55+
56+
You might as well pull the `*.deb` from within the image
57+
and install on Debian Bullseye.

README.md

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -169,50 +169,11 @@ apt install $PWD/src/*.deb
169169

170170
## Recompile latest version or master
171171

172-
You can compile latest version or master with a set of commands
173-
and push them to the registry.
174-
175-
```bash
176-
# build v1.0.5
177-
make all-build VERSION=v1.0.5
178-
179-
# build master
180-
make all-build
181-
182-
# build and push to registry v1.0.5
183-
make all-push VERSION=v1.0.5 REGISTRY=my.registry.com/pbs
184-
185-
# build and push to registry v1.0.5
186-
make all-push REGISTRY=my.registry.com/pbs
187-
188-
# make the given version latest
189-
make all-latest VERSION=v1.0.5
190-
```
172+
Refer to [PROCESS.md](PROCESS.md).
191173

192174
## Build on your own
193175

194-
```bash
195-
make dev-build
196-
```
197-
198-
It builds on any platform, which can be: `amd64`, `arm32v7`, `arm64v8`,
199-
etc. Wait a around 1-3h to compile.
200-
201-
Then you can push to your registry:
202-
203-
```bash
204-
make dev-push
205-
```
206-
207-
Or run locally:
208-
209-
```bash
210-
make dev-shell
211-
make dev-run
212-
```
213-
214-
You might as well pull the `*.deb` from within the image
215-
and install on Debian Bullseye.
176+
Refer to [PROCESS.md](PROCESS.md).
216177

217178
## Author
218179

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ version: '2.1'
33
services:
44
pbs:
55
image: ayufan/proxmox-backup-server:${TAG:-latest}
6-
network_mode: host
6+
ports:
7+
- 8007:8007
78
mem_limit: 2G
89
volumes:
910
- pbs_etc:/etc/proxmox-backup

0 commit comments

Comments
 (0)