diff --git a/Dockerfile b/Dockerfile index 330e70c..8ec7c57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM ubuntu:jammy ENV TZ=Asia/Taipei TERM=linux RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \ - apt-get update && apt-get -y upgrade && \ - apt-get -y install vim zip unzip curl wget git imagemagick pngquant gpsbabel proj-bin inkscape fonts-wqy-zenhei netcat \ - img2pdf ghostscript php php-cli php-gd php-xml php-curl php-json php-mbstring php-zip && \ + apt-get update && \ + apt-get install -y ca-certificates vim zip unzip curl wget git imagemagick pngquant gpsbabel proj-bin inkscape fonts-wqy-zenhei netcat \ + img2pdf ghostscript php php-cli php-gd php-xml php-curl php-json php-mbstring php-zip php-redis && \ sed -i -E 's/name="memory" value=".+"/name="memory" value="8GiB"/g' /etc/ImageMagick-6/policy.xml &&\ sed -i -E 's/name="map" value=".+"/name="map" value="8GiB"/g' /etc/ImageMagick-6/policy.xml &&\ sed -i -E 's/name="area" value=".+"/name="area" value="8GiB"/g' /etc/ImageMagick-6/policy.xml &&\ diff --git a/README.md b/README.md index 26abb47..759eb4b 100644 --- a/README.md +++ b/README.md @@ -5,14 +5,17 @@ twmap base env, used by docker-twmap-cli check Dockerfile for required packages. + +check build.sh (amd64) + build-arm.sh (arm64) + + ``` build for amd64 and arm64 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-- docker buildx create --name mybuilder docker buildx use mybuilder -docker buildx build --platform linux/aarch64,linux/amd64 -t happyman/docker-twmap-base:latest --push . +docker buildx build --platform linux/aarch64 -t happyman/docker-twmap-base:arm64-latest --push . -cd ../docker-twmap-cli -docker buildx build --platform linux/aarch64,linux/amd64 -t happyman/docker-twmap-cli:latest --push . ``` diff --git a/VERSION b/VERSION index b001f9f..6354a50 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.4 +v2.7 diff --git a/build-arm.sh b/build-arm.sh new file mode 100755 index 0000000..49cf38c --- /dev/null +++ b/build-arm.sh @@ -0,0 +1,2 @@ +#!/bin/bash +docker buildx build --platform linux/aarch64 -t happyman/docker-twmap-base:arm64-`cat VERSION` -t happyman/docker-twmap-base:arm64-latest --push . diff --git a/build.sh b/build.sh index 5992d3a..e43b87c 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,8 @@ tag=happyman/docker-twmap-base:`cat VERSION` -docker build -t $tag -t happyman/docker-twmap-base:latest . +docker build -t $tag -t happyman/docker-twmap-base:latest --push . # docker push -echo docker push $tag -echo docker push happyman/docker-twmap-base:latest +docker push $tag + +# arm64 +#docker buildx build --platform linux/aarch64 -t happyman/docker-twmap-base:arm64-`cat VERSION` -t happyman/docker-twmap-base:arm64-latest --push . diff --git a/test.sh b/test.sh new file mode 100755 index 0000000..e1249e1 --- /dev/null +++ b/test.sh @@ -0,0 +1,2 @@ +docker run -i --rm happyman/docker-twmap-base:arm64-latest identify -list format +docker run -i --rm happyman/docker-twmap-base:latest identify -list format