diff options
| author | silvio | 2021-06-07 01:13:08 +0200 |
|---|---|---|
| committer | GitHub | 2021-06-07 01:13:08 +0200 |
| commit | 0bf34607d21d5145eb7e9cd784f5b1752d345a20 (patch) | |
| tree | ea4bafda4e1662d5ac9181334b727039d0ac8729 | |
| parent | ec49e551891baba27666abaa5363eed1e83f4f9b (diff) | |
| parent | 32f9fcbd68f3fc8f3144d3fb3fe83ee59437a5e6 (diff) | |
| download | languagetool-0bf34607d21d5145eb7e9cd784f5b1752d345a20.tar.gz | |
Merge pull request #24 from NBZ4live/feature/arm_support
Multiarch
| -rw-r--r-- | .github/workflows/main.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 7 | ||||
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | Makefile.version | 1 |
5 files changed, 23 insertions, 7 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b679a22..3fddc7e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,6 +16,13 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + - name: Set environment variables run: | make envout >> ${GITHUB_ENV} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 284e4bd..de95a7f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,6 +12,13 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + - name: Set environment variables run: | make envout >> ${GITHUB_ENV} @@ -1,11 +1,11 @@ -FROM openjdk:14-alpine +FROM openjdk:16-slim-buster # see Makefile.version ARG VERSION MAINTAINER Silvio Fricke <silvio.fricke@gmail.com> -RUN apk add --no-cache libgomp gcompat libstdc++ +RUN apt-get update && apt-get install -y wget unzip && rm -rf /var/lib/apt/lists/* RUN wget https://www.languagetool.org/download/LanguageTool-$VERSION.zip && \ unzip LanguageTool-$VERSION.zip && \ @@ -5,13 +5,14 @@ envout: @echo "VERSION=$(VERSION)" @echo "BUILDARG_VERSION=$(BUILDARG_VERSION)" @echo "IMAGENAME=$(IMAGENAME)" + @echo "BUILDARG_PLATFORM=$(BUILDARG_PLATFORM)" prepare: sudo apt-get -qq -y install curl build: - docker build $(BUILDARG_VERSION) -t $(IMAGENAME):latest . - docker tag $(IMAGENAME):latest $(IMAGENAME):$(VERSION) + docker buildx build $(BUILDARG_VERSION) $(BUILDARG_PLATFORM) -t $(IMAGENAME):latest . + docker buildx build $(BUILDARG_VERSION) --load -t $(IMAGENAME):latest . test: test-cleanup.1 test: TESTIPADDRESS=$(subst ",,$(shell docker inspect languagetool | jq '.[0].NetworkSettings.IPAddress')) @@ -23,7 +24,7 @@ test: test-run-test-fr test: test-cleanup.2 test-start: - docker run -d --name languagetool -p 8010:8010 $(IMAGENAME):$(VERSION) + docker run -d --name languagetool -p 8010:8010 $(IMAGENAME):latest sleep 3 test-print-ip-address: @@ -60,5 +61,5 @@ tag: tag-push .PHONY: tag-push tag-push: - docker push $(IMAGENAME):latest - docker push $(IMAGENAME):$(VERSION) + docker buildx build $(BUILDARG_VERSION) $(BUILDARG_PLATFORM) -t $(IMAGENAME):latest . --push + docker buildx build $(BUILDARG_VERSION) $(BUILDARG_PLATFORM) -t $(IMAGENAME):$(VERSION) . --push diff --git a/Makefile.version b/Makefile.version index 521f2ca..cf0bb63 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,3 +1,4 @@ VERSION := 5.3 BUILDARG_VERSION := --build-arg VERSION=$(VERSION) IMAGENAME := docker.io/silviof/docker-languagetool +BUILDARG_PLATFORM := --platform linux/amd64,linux/arm64/v8 |