adalal/gotenberg
1
0
Fork 0
mirror of https://github.com/gotenberg/gotenberg.git synced 2026-08-17 12:42:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: typo Docker Registry -> Docker Repository

Browse Source
This commit is contained in:
Julien Neuhart
2021-08-27 19:09:15 +02:00
parent 781094ab05
commit 40cc019a51
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/continuous_delivery.yml vendored
View File

@@ -24,4 +24,4 @@ jobs:
- name: Build and push Docker image - name: Build and push Docker image
run: | run: |
make release GOTENBERG_VERSION=${{ github.event.release.tag_name }} make release GOTENBERG_VERSION=${{ github.event.release.tag_name }}
make release GOTENBERG_VERSION=${{ github.event.release.tag_name }} DOCKER_REGISTRY=thecodingmachine make release GOTENBERG_VERSION=${{ github.event.release.tag_name }} DOCKER_REPOSITORY=thecodingmachine

18
Makefile
View File

@@ -6,7 +6,7 @@ help: ## Show the help
it: build build-tests ## Initialize the development environment it: build build-tests ## Initialize the development environment
GOLANG_VERSION=1.17 GOLANG_VERSION=1.17
DOCKER_REGISTRY=gotenberg DOCKER_REPOSITORY=gotenberg
GOTENBERG_VERSION=snapshot GOTENBERG_VERSION=snapshot
GOTENBERG_USER_GID=1001 GOTENBERG_USER_GID=1001
GOTENBERG_USER_UID=1001 GOTENBERG_USER_UID=1001
@@ -21,7 +21,7 @@ build: ## Build the Gotenberg's Docker image
--build-arg GOTENBERG_USER_GID=$(GOTENBERG_USER_GID) \ --build-arg GOTENBERG_USER_GID=$(GOTENBERG_USER_GID) \
--build-arg GOTENBERG_USER_UID=$(GOTENBERG_USER_UID) \ --build-arg GOTENBERG_USER_UID=$(GOTENBERG_USER_UID) \
--build-arg PDFTK_VERSION=$(PDFTK_VERSION) \ --build-arg PDFTK_VERSION=$(PDFTK_VERSION) \
-t $(DOCKER_REGISTRY)/gotenberg:$(GOTENBERG_VERSION) \ -t $(DOCKER_REPOSITORY)/gotenberg:$(GOTENBERG_VERSION) \
-f build/Dockerfile . -f build/Dockerfile .
GOTENBERG_GRACEFUL_SHUTDOWN_DURATION=30s GOTENBERG_GRACEFUL_SHUTDOWN_DURATION=30s
@@ -57,7 +57,7 @@ PDFENGINES_DISABLE_ROUTES=false
run: ## Start a Gotenberg container run: ## Start a Gotenberg container
docker run --rm -it \ docker run --rm -it \
-p $(API_PORT):$(API_PORT) \ -p $(API_PORT):$(API_PORT) \
$(DOCKER_REGISTRY)/gotenberg:$(GOTENBERG_VERSION) \ $(DOCKER_REPOSITORY)/gotenberg:$(GOTENBERG_VERSION) \
gotenberg \ gotenberg \
--gotenberg-graceful-shutdown-duration=$(GOTENBERG_GRACEFUL_SHUTDOWN_DURATION) \ --gotenberg-graceful-shutdown-duration=$(GOTENBERG_GRACEFUL_SHUTDOWN_DURATION) \
--api-port=$(API_PORT) \ --api-port=$(API_PORT) \
@@ -92,24 +92,24 @@ run: ## Start a Gotenberg container
build-tests: ## Build the tests' Docker image build-tests: ## Build the tests' Docker image
docker build \ docker build \
--build-arg GOLANG_VERSION=$(GOLANG_VERSION) \ --build-arg GOLANG_VERSION=$(GOLANG_VERSION) \
--build-arg DOCKER_REGISTRY=$(DOCKER_REGISTRY) \ --build-arg DOCKER_REPOSITORY=$(DOCKER_REPOSITORY) \
--build-arg GOTENBERG_VERSION=$(GOTENBERG_VERSION) \ --build-arg GOTENBERG_VERSION=$(GOTENBERG_VERSION) \
--build-arg GOLANGCI_LINT_VERSION=$(GOLANGCI_LINT_VERSION) \ --build-arg GOLANGCI_LINT_VERSION=$(GOLANGCI_LINT_VERSION) \
-t $(DOCKER_REGISTRY)/gotenberg:$(GOTENBERG_VERSION)-tests \ -t $(DOCKER_REPOSITORY)/gotenberg:$(GOTENBERG_VERSION)-tests \
-f test/Dockerfile . -f test/Dockerfile .
.PHONY: tests .PHONY: tests
tests: ## Start the testing environment tests: ## Start the testing environment
docker run --rm -it \ docker run --rm -it \
-v $(PWD):/tests \ -v $(PWD):/tests \
$(DOCKER_REGISTRY)/gotenberg:$(GOTENBERG_VERSION)-tests \ $(DOCKER_REPOSITORY)/gotenberg:$(GOTENBERG_VERSION)-tests \
bash bash
.PHONY: tests-once .PHONY: tests-once
tests-once: ## Run the tests once (prefer the "tests" command while developing) tests-once: ## Run the tests once (prefer the "tests" command while developing)
docker run --rm \ docker run --rm \
-v $(PWD):/tests \ -v $(PWD):/tests \
$(DOCKER_REGISTRY)/gotenberg:$(GOTENBERG_VERSION)-tests \ $(DOCKER_REPOSITORY)/gotenberg:$(GOTENBERG_VERSION)-tests \
gotest gotest
.PHONY: fmt .PHONY: fmt
@@ -123,11 +123,11 @@ godoc: ## Run a webserver with Gotenberg godoc (go get golang.org/x/tools/cmd/go
godoc -http=:6060 godoc -http=:6060
.PHONY: release .PHONY: release
release: ## Build the Gotenberg's Docker image for linux/amd64 and linux/arm64 platforms, then push it to a Docker Registry release: ## Build the Gotenberg's Docker image for linux/amd64 and linux/arm64 platforms, then push it to a Docker repository
./scripts/release.sh \ ./scripts/release.sh \
$(GOLANG_VERSION) \ $(GOLANG_VERSION) \
$(GOTENBERG_VERSION) \ $(GOTENBERG_VERSION) \
$(GOTENBERG_USER_GID) \ $(GOTENBERG_USER_GID) \
$(GOTENBERG_USER_UID) \ $(GOTENBERG_USER_UID) \
$(PDFTK_VERSION) \ $(PDFTK_VERSION) \
$(DOCKER_REGISTRY) $(DOCKER_REPOSITORY)

2
README.md
View File

@@ -18,7 +18,7 @@ Open a terminal and run the following command:
docker run --rm -p 3000:3000 gotenberg/gotenberg:7 docker run --rm -p 3000:3000 gotenberg/gotenberg:7
``` ```
Alternatively, using the historic Docker registry from our sponsor [TheCodingMachine](https://www.thecodingmachine.com): Alternatively, using the historic Docker repository from our sponsor [TheCodingMachine](https://www.thecodingmachine.com):
``` ```
docker run --rm -p 3000:3000 thecodingmachine/gotenberg:7 docker run --rm -p 3000:3000 thecodingmachine/gotenberg:7

4
build/Dockerfile.cloudrun
View File

@@ -1,9 +1,9 @@
# Note: ARG instructions do not create additional layers. # Note: ARG instructions do not create additional layers.
# Instead, next layers will concatenate them. # Instead, next layers will concatenate them.
ARG DOCKER_REGISTRY ARG DOCKER_REPOSITORY
ARG GOTENBERG_VERSION ARG GOTENBERG_VERSION
FROM $DOCKER_REGISTRY/gotenberg:$GOTENBERG_VERSION FROM $DOCKER_REPOSITORY/gotenberg:$GOTENBERG_VERSION
USER root USER root

20
scripts/release.sh
View File

@@ -7,7 +7,7 @@ GOTENBERG_VERSION="$2"
GOTENBERG_USER_GID="$3" GOTENBERG_USER_GID="$3"
GOTENBERG_USER_UID="$4" GOTENBERG_USER_UID="$4"
PDFTK_VERSION="$5" PDFTK_VERSION="$5"
DOCKER_REGISTRY="$6" DOCKER_REPOSITORY="$6"
GOTENBERG_VERSION="${GOTENBERG_VERSION//v}" GOTENBERG_VERSION="${GOTENBERG_VERSION//v}"
SEMVER=( ${GOTENBERG_VERSION//./ } ) SEMVER=( ${GOTENBERG_VERSION//./ } )
@@ -26,22 +26,22 @@ docker buildx build \
--build-arg PDFTK_VERSION="$PDFTK_VERSION" \ --build-arg PDFTK_VERSION="$PDFTK_VERSION" \
--platform linux/amd64 \ --platform linux/amd64 \
--platform linux/arm64 \ --platform linux/arm64 \
-t "$DOCKER_REGISTRY/gotenberg:latest" \ -t "$DOCKER_REPOSITORY/gotenberg:latest" \
-t "$DOCKER_REGISTRY/gotenberg:${SEMVER[0]}" \ -t "$DOCKER_REPOSITORY/gotenberg:${SEMVER[0]}" \
-t "$DOCKER_REGISTRY/gotenberg:${SEMVER[0]}.${SEMVER[1]}" \ -t "$DOCKER_REPOSITORY/gotenberg:${SEMVER[0]}.${SEMVER[1]}" \
-t "$DOCKER_REGISTRY/gotenberg:${SEMVER[0]}.${SEMVER[1]}.${SEMVER[2]}" \ -t "$DOCKER_REPOSITORY/gotenberg:${SEMVER[0]}.${SEMVER[1]}.${SEMVER[2]}" \
--push \ --push \
-f build/Dockerfile . -f build/Dockerfile .
# Cloud Run variant. # Cloud Run variant.
docker buildx build \ docker buildx build \
--build-arg DOCKER_REGISTRY="$DOCKER_REGISTRY" \ --build-arg DOCKER_REPOSITORY="$DOCKER_REPOSITORY" \
--build-arg GOTENBERG_VERSION="$GOTENBERG_VERSION" \ --build-arg GOTENBERG_VERSION="$GOTENBERG_VERSION" \
--platform linux/amd64 \ --platform linux/amd64 \
--platform linux/arm64 \ --platform linux/arm64 \
-t "$DOCKER_REGISTRY/gotenberg:latest-cloudrun" \ -t "$DOCKER_REPOSITORY/gotenberg:latest-cloudrun" \
-t "$DOCKER_REGISTRY/gotenberg:${SEMVER[0]}-cloudrun" \ -t "$DOCKER_REPOSITORY/gotenberg:${SEMVER[0]}-cloudrun" \
-t "$DOCKER_REGISTRY/gotenberg:${SEMVER[0]}.${SEMVER[1]}-cloudrun" \ -t "$DOCKER_REPOSITORY/gotenberg:${SEMVER[0]}.${SEMVER[1]}-cloudrun" \
-t "$DOCKER_REGISTRY/gotenberg:${SEMVER[0]}.${SEMVER[1]}.${SEMVER[2]}-cloudrun" \ -t "$DOCKER_REPOSITORY/gotenberg:${SEMVER[0]}.${SEMVER[1]}.${SEMVER[2]}-cloudrun" \
--push \ --push \
-f build/Dockerfile.cloudrun . -f build/Dockerfile.cloudrun .

4
test/Dockerfile
View File

@@ -1,5 +1,5 @@
ARG GOLANG_VERSION ARG GOLANG_VERSION
ARG DOCKER_REGISTRY ARG DOCKER_REPOSITORY
ARG GOTENBERG_VERSION ARG GOTENBERG_VERSION
ARG GOLANGCI_LINT_VERSION ARG GOLANGCI_LINT_VERSION
@@ -7,7 +7,7 @@ FROM golang:$GOLANG_VERSION-stretch as golang
# We're extending the Gotenberg's Docker image because our code relies on external # We're extending the Gotenberg's Docker image because our code relies on external
# dependencies like Google Chrome, LibreOffice, etc. # dependencies like Google Chrome, LibreOffice, etc.
FROM $DOCKER_REGISTRY/gotenberg:$GOTENBERG_VERSION FROM $DOCKER_REPOSITORY/gotenberg:$GOTENBERG_VERSION
USER root USER root