Skip to content

Commit 4a996b5

Browse files
committed
chore(break change): change binary and config location in docker
1 parent 8cdcb49 commit 4a996b5

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
2121
FROM ${RUNTIME_IMAGE}
2222

2323
RUN mkdir /data
24-
COPY --from=builder ./config.release.conf ./config.conf
25-
COPY --from=builder ./target/release/spa-server .
24+
COPY --from=builder ./config.release.conf /config/config.conf
25+
COPY --from=builder ./target/release/spa-server /usr/bin/
2626

2727
CMD ["./spa-server"]

docker/S3FS.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ FROM ${BASE_IMAGE}:${VERSION} as Source
55

66

77
FROM panubo/s3fs:1.84
8-
COPY --from=Source ./config.conf .
9-
COPY --from=Source ./spa-server .
8+
COPY --from=Source /config/config.conf /config/config.conf
9+
COPY --from=Source /usr/bin/spa-server /usr/bin/spa-server
1010

1111
COPY entry.sh /entry.sh
1212

docs/develop/roadmap.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
There is no real roadmap for v1.3.x now, need users firstly.
55

6+
- [ ] feat: cluster?
7+
68
### near future before v1.3.0
79
- [ ] CD: release triggered by new tag
810
- [ ] TEST: test integrate, and add ci to run it
@@ -12,8 +14,9 @@ There is no real roadmap for v1.3.x now, need users firstly.
1214
- [ ] doc: what's version control and file directory layout
1315
- [ ] chore: spa-client command help doc
1416
- [ ] bench: add benchmark
17+
- [x] chore(break change): change server docker config and binary location
1518
- [x] feat(with client): delete deprecated version to save storage
16-
- [x] feat: Support S3 by docker(backward: release docker timzaak/spa-server:1.2.5-s3)
19+
- [x] feat: Support S3 by docker(backward: release docker image: timzaak/spa-server:1.2.5-s3)
1720
- [x] deps: bump hocon 0.9, fix size unit config parse
1821
- [x] fix(build): disable generating new tag when build spa-client(js) success
1922
- [x] doc: add algolia search, thanks for algolia company!

server/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use serde::Deserialize;
44
use std::env;
55
use std::time::Duration;
66

7-
const CONFIG_PATH: &str = "config.conf";
7+
const CONFIG_PATH: &str = "/config/config.conf";
88

99
// pub type Config = Arc<AppConfig>
1010

0 commit comments

Comments
 (0)