updating some folders names

This commit is contained in:
Julien Neuhart
2018-04-06 17:40:50 +02:00
parent 21ace615c2
commit 62c72d293e
9 changed files with 14 additions and 14 deletions

View File

@@ -38,14 +38,14 @@ COPY . .
# Installs project dependencies.
RUN go get -d -v ./...
ENTRYPOINT ["_ci/docker-entrypoint.sh"]
ENTRYPOINT [".ci/docker-entrypoint.sh"]
{{- else }}
COPY _build/gotenberg /usr/bin/gotenberg
COPY .build/gotenberg /usr/bin/gotenberg
RUN ln -s /usr/bin/gotenberg /usr/local/bin/gotenberg
WORKDIR /gotenberg
COPY gotenberg.yml /gotenberg/gotenberg.yml
COPY .build/gotenberg.yml /gotenberg/gotenberg.yml
EXPOSE 3000
CMD ["gotenberg"]

View File

@@ -11,18 +11,18 @@ if [[ "$VERSION" == "snapshot" ]]; then
go test -race -cover $d;
done
else
echo "" > ./_ci/coverage.txt;
echo "" > ./.ci/coverage.txt;
for d in $(go list ./... | grep -v vendor); do
go test -race -coverprofile=profile.out -covermode=atomic $d;
if [ -f profile.out ]; then
cat profile.out >> ./_ci/coverage.txt;
cat profile.out >> ./.ci/coverage.txt;
rm profile.out;
fi
done
fi
# Builds the Linux binary.
env GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "-X main.version=${VERSION}" && mv gotenberg _build/;
env GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "-X main.version=${VERSION}" && mv gotenberg .build/;
# Bye!
exit 0;

2
.gitignore vendored
View File

@@ -1,2 +1,2 @@
.DS_Store
_ci/coverage.txt
.ci/coverage.txt

View File

@@ -24,11 +24,11 @@ RUN echo "deb http://httpredir.debian.org/debian/ stretch main contrib non-free"
# | All Gotenberg related stuff.
# |
COPY _build/gotenberg /usr/bin/gotenberg
COPY .build/gotenberg /usr/bin/gotenberg
RUN ln -s /usr/bin/gotenberg /usr/local/bin/gotenberg
WORKDIR /gotenberg
COPY gotenberg.yml /gotenberg/gotenberg.yml
COPY .build/gotenberg.yml /gotenberg/gotenberg.yml
EXPOSE 3000
CMD ["gotenberg"]

View File

@@ -36,4 +36,4 @@ COPY . .
# Installs project dependencies.
RUN go get -d -v ./...
ENTRYPOINT ["_ci/docker-entrypoint.sh"]
ENTRYPOINT [".ci/docker-entrypoint.sh"]

View File

@@ -8,15 +8,15 @@ tasks:
- use: generate
short: Generates all files from blueprints
run:
- BRANCH="$(git symbolic-ref --short HEAD)"; orbit generate -f _blueprints/README.blueprint.md -o README.md -p "Branch,${BRANCH}"
- orbit generate -f _blueprints/Dockerfile.blueprint -o Dockerfile.ci -p "Image,CI"
- orbit generate -f _blueprints/Dockerfile.blueprint -o Dockerfile -p "Image,MAIN"
- BRANCH="$(git symbolic-ref --short HEAD)"; orbit generate -f .blueprints/README.blueprint.md -o README.md -p "Branch,${BRANCH}"
- orbit generate -f .blueprints/Dockerfile.blueprint -o Dockerfile.ci -p "Image,CI"
- orbit generate -f .blueprints/Dockerfile.blueprint -o Dockerfile -p "Image,MAIN"
- use: ci
short: Runs CI process inside a container
run:
- docker build -t gotenberg:ci -f Dockerfile.ci .
- docker run --rm -e "VERSION={{ .Orbit.Version }}" -v "$(pwd)/_ci:/go/src/github.com/thecodingmachine/gotenberg/_ci" -v "$(pwd)/_build:/go/src/github.com/thecodingmachine/gotenberg/_build" gotenberg:ci
- docker run --rm -e "VERSION={{ .Orbit.Version }}" -v "$(pwd)/.ci:/go/src/github.com/thecodingmachine/gotenberg/.ci" -v "$(pwd)/.build:/go/src/github.com/thecodingmachine/gotenberg/.build" gotenberg:ci
- use: build
short: Builds the main Docker image