fix(cd): 1.add default user in docker image for avoiding permission issues 2.add demo Dockerfile
This commit is contained in:
parent
a5a9939fae
commit
e830611af1
4 changed files with 33 additions and 8 deletions
10
Dockerfile
10
Dockerfile
|
@ -10,6 +10,12 @@ RUN yarn run build:fe \
|
||||||
&& cp -R /quickshare/public /quickshare/dist/quickshare
|
&& cp -R /quickshare/public /quickshare/dist/quickshare
|
||||||
|
|
||||||
FROM debian:stable-slim
|
FROM debian:stable-slim
|
||||||
|
RUN groupadd -g 8686 quickshare
|
||||||
|
RUN useradd quickshare -u 8686 -g 8686 -m -s /bin/bash
|
||||||
|
RUN usermod -a -G quickshare root
|
||||||
COPY --from=build-fe /quickshare/dist/quickshare /quickshare
|
COPY --from=build-fe /quickshare/dist/quickshare /quickshare
|
||||||
ADD configs/docker.yml /quickshare
|
ADD configs/demo.yml /quickshare
|
||||||
CMD ["/quickshare/start", "-c", "/quickshare/docker.yml"]
|
RUN mkdir -p /quickshare/root
|
||||||
|
RUN chgrp -R quickshare /quickshare
|
||||||
|
RUN chmod -R 0770 /quickshare
|
||||||
|
CMD ["/quickshare/start", "-c", "/quickshare/demo.yml"]
|
||||||
|
|
21
Dockerfile_default
Normal file
21
Dockerfile_default
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
FROM golang:1.15 as build-be
|
||||||
|
ADD . /quickshare
|
||||||
|
WORKDIR /quickshare
|
||||||
|
RUN /quickshare/scripts/build_exec.sh
|
||||||
|
|
||||||
|
FROM node:lts as build-fe
|
||||||
|
COPY --from=build-be /quickshare /quickshare
|
||||||
|
WORKDIR /quickshare
|
||||||
|
RUN yarn run build:fe \
|
||||||
|
&& cp -R /quickshare/public /quickshare/dist/quickshare
|
||||||
|
|
||||||
|
FROM debian:stable-slim
|
||||||
|
RUN groupadd -g 8686 quickshare
|
||||||
|
RUN useradd quickshare -u 8686 -g 8686 -m -s /bin/bash
|
||||||
|
RUN usermod -a -G quickshare root
|
||||||
|
COPY --from=build-fe /quickshare/dist/quickshare /quickshare
|
||||||
|
ADD configs/docker.yml /quickshare
|
||||||
|
RUN mkdir -p /quickshare/root
|
||||||
|
RUN chgrp -R quickshare /quickshare
|
||||||
|
RUN chmod -R 0770 /quickshare
|
||||||
|
CMD ["/quickshare/start", "-c", "/quickshare/docker.yml"]
|
|
@ -29,10 +29,7 @@ users:
|
||||||
spaceLimit: 104857600 # 100MB
|
spaceLimit: 104857600 # 100MB
|
||||||
limiterCapacity: 1000
|
limiterCapacity: 1000
|
||||||
limiterCyc: 1000 # 1s
|
limiterCyc: 1000 # 1s
|
||||||
predefinedUsers:
|
predefinedUsers: []
|
||||||
- name: "demo"
|
|
||||||
pwd: "Quicksh@re"
|
|
||||||
role: "user"
|
|
||||||
workers:
|
workers:
|
||||||
queueSize: 1024
|
queueSize: 1024
|
||||||
sleepCyc: 1 # in second
|
sleepCyc: 1 # in second
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -o nounset errexit
|
set -o nounset errexit
|
||||||
|
|
||||||
export QSROOT=`pwd`
|
export QSROOT
|
||||||
|
QSROOT=$(pwd)
|
||||||
rm -r dist && mkdir dist
|
rm -r dist && mkdir dist
|
||||||
docker builder prune
|
docker builder prune
|
||||||
|
|
||||||
# set this for builders behind GFW...
|
# set this for users behind GFW...
|
||||||
go env -w GOPROXY=https://goproxy.cn,direct
|
go env -w GOPROXY=https://goproxy.cn,direct
|
||||||
go get -d -v ./...
|
go get -d -v ./...
|
||||||
go get github.com/mitchellh/gox
|
go get github.com/mitchellh/gox
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue