Skip to content

Commit

Permalink
fixes ..
Browse files Browse the repository at this point in the history
  • Loading branch information
ImreSamu committed Oct 8, 2023
1 parent 47c76c7 commit 411aa9b
Show file tree
Hide file tree
Showing 18 changed files with 98 additions and 62 deletions.
28 changes: 17 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ version: 2.1

orbs:
# https://circleci.com/developer/orbs/orb/circleci/docker
docker: circleci/[email protected]
docker: circleci/[email protected]
# https://circleci.com/developer/orbs/orb/circleci/python
python: circleci/[email protected]


jobs:
build-arm64:
Expand All @@ -24,6 +27,15 @@ jobs:
- run: uname -a
- run: docker --version
- run: docker info
- run:
name: Install manifest-tool (linux-arm64 )
command: |
wget https://github.com/estesp/manifest-tool/releases/download/v2.0.8/binaries-manifest-tool-2.0.8.tar.gz
mkdir manifest-tool
tar -xvzf binaries-manifest-tool-2.0.8.tar.gz -C manifest-tool
sudo mv manifest-tool/manifest-tool-linux-arm64 /usr/local/bin/manifest-tool
manifest-tool -v
- run: pip3 install lastversion
- run: source tools/environment_init.sh
- run: make check_version
- docker/check:
Expand All @@ -36,7 +48,10 @@ jobs:
command: |
# Check if the current branch is 'master' and the weekly image is not extis
# If weekly image exists, skip docker build and push
if [ "$CIRCLE_BRANCH" == "master" ] && check_image_exists "${{ matrix.version }}-${{ matrix.variant }}$(IMAGE_VERSION_ID)"; then
source tools/environment_init.sh
echo "check: << parameters.target-version-variant >>${IMAGE_VERSION_ID}"
check_image_exists "<< parameters.target-version-variant >>${IMAGE_VERSION_ID}" || true
if [ "$CIRCLE_BRANCH" == "master" ] && check_image_exists "<< parameters.target-version-variant >>${IMAGE_VERSION_ID}"; then
circleci-agent step halt
fi
Expand All @@ -53,15 +68,6 @@ jobs:
circleci-agent step halt
fi
- run:
name: Install manifest-tool (linux-arm64 )
command: |
wget https://github.com/estesp/manifest-tool/releases/download/v2.0.8/binaries-manifest-tool-2.0.8.tar.gz
mkdir manifest-tool
tar -xvzf binaries-manifest-tool-2.0.8.tar.gz -C manifest-tool
sudo mv manifest-tool/manifest-tool-linux-arm64 /usr/local/bin/manifest-tool
manifest-tool -v
- run:
name: "Push docker image : make push-<< parameters.target-version-variant >>"
command: |
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/localtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,13 @@ jobs:
steps:
- uses: actions/checkout@v4
- run: docker ps -a
- name: Install manifest-tool
run: |
wget https://github.com/estesp/manifest-tool/releases/download/v2.0.8/binaries-manifest-tool-2.0.8.tar.gz
mkdir manifest-tool
tar -xvzf binaries-manifest-tool-2.0.8.tar.gz -C manifest-tool
sudo mv manifest-tool/manifest-tool-linux-amd64 /usr/local/bin/manifest-tool
manifest-tool -v
- run: pip install lastversion
- run: ./localtest.sh
- run: docker images
25 changes: 13 additions & 12 deletions .github/workflows/main.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions 11-3.3/alpine3.18/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions 12-3.4/alpine3.18/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions 13-3.4/alpine3.18/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions 14-3.4/alpine3.18/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions 15-3.4/alpine3.18/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion 15-master/bookworm/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions 15-recentstack/bookworm/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions 16-3.4/alpine3.18/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion 16-master/bookworm/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions 16-recentstack/bookworm/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Dockerfile.alpine.template
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ RUN set -eux \
\
autoconf \
automake \
bison \
cunit-dev \
docbook-xml \
docbook5-xml \
file \
g++ \
gcc \
Expand Down Expand Up @@ -136,7 +135,8 @@ RUN set -eux \
# clean
&& cd / \
&& rm -rf /usr/src/postgis \
&& apk del .fetch-deps .build-deps \
&& apk del .build-deps \
#&& apk del .fetch-deps \
# At the end of the build, we print the collected information
# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes.
&& cat /_pgis_full_version.txt
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.master.template
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,10 @@ ARG PGIS_V1_POSTGIS_REPOSITORY
ENV PGIS_V1_POSTGIS_CHECKOUT=${PGIS_V1_POSTGIS_CHECKOUT} \
PGIS_V1_POSTGIS_REPOSITORY=${PGIS_V1_POSTGIS_REPOSITORY}

# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables
# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388
RUN echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen

RUN set -ex \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions versions.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 411aa9b

Please sign in to comment.