Skip to content

Commit

Permalink
update to 6.3a
Browse files Browse the repository at this point in the history
Unluckily 6.3a is build in a unconform way, the name is 6.3a but
unpacked its just 6.3. I guess half of this commit needs to be reverted
later. We will see.

fixes #59

Signed-off-by: Silvio Fricke <[email protected]>
  • Loading branch information
silvio committed Dec 18, 2023
1 parent 8655361 commit cc9e232
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ FROM docker.io/library/eclipse-temurin:19

# see Makefile.version
ARG VERSION
ARG UNPACKED_VERSION

LABEL maintainer="Silvio Fricke <[email protected]>"

ADD ./LanguageTool-"${VERSION}" /
ADD ./LanguageTool-"${UNPACKED_VERSION}" /

WORKDIR /LanguageTool-"$VERSION"
WORKDIR /LanguageTool-"${UNPACKED_VERSION}"

COPY misc/start.sh .
CMD [ "sh", "start.sh" ]
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ include Makefile.version

envout:
@echo "VERSION=$(VERSION)"
@echo "UNPACKED_VERSION=$(UNPACKED_VERSION)"
@echo "BUILDARG_VERSION=$(BUILDARG_VERSION)"
@echo "IMAGENAME=$(IMAGENAME)"
@echo "BUILDARG_PLATFORM=$(BUILDARG_PLATFORM)"
Expand All @@ -16,7 +17,7 @@ build: download
docker buildx build $(BUILDARG_VERSION) --load -t $(IMAGENAME):latest .

download: LanguageTool-$(VERSION).zip
-rm -rf LanguageTool-$(VERSION) LanguageTool-$(VERSION)
-rm -rf LanguageTool-$(VERSION) LanguageTool-$(UNPACKED_VERSION)
echo ":: unzipping LanguageTool-$(VERSION).zip"
unzip -o LanguageTool-$(VERSION).zip 2>&1 1>/dev/null

Expand Down
5 changes: 3 additions & 2 deletions Makefile.version
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: LGPL-3.0-or-later
VERSION := 6.3
BUILDARG_VERSION := --build-arg VERSION=$(VERSION)
VERSION := 6.3a
UNPACKED_VERSION := $(shell echo $(VERSION) | sed -e 's/\([0-9]\+\.[0-9]\+\)\(.*\)/\1/')
BUILDARG_VERSION := --build-arg VERSION=$(VERSION) --build-arg UNPACKED_VERSION=$(UNPACKED_VERSION)
IMAGENAME := docker.io/silviof/docker-languagetool
BUILDARG_PLATFORM := --platform linux/amd64,linux/arm64/v8,linux/arm/v7

0 comments on commit cc9e232

Please sign in to comment.