diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml index 26eff41..d0cc970 100644 --- a/.github/workflows/stable-build.yml +++ b/.github/workflows/stable-build.yml @@ -44,8 +44,6 @@ jobs: VERSION=${{ github.event.inputs.tag }} PRODUCT_EDITION=${{ matrix.edition }} TESTING_IMAGE=${COMPANY_NAME}/4testing-${PRODUCT_NAME}${PRODUCT_EDITION} - if docker manifest inspect ${TESTING_IMAGE}:${VERSION} > /dev/null; then - echo "Image present on docker.hub >> start build stable version" export PRODUCT_EDITION export TAG=${VERSION} export SHORTER_TAG=${VERSION%.*} @@ -53,10 +51,6 @@ jobs: docker buildx bake -f docker-bake.hcl ${{ matrix.images }} --push echo "DONE: Build success >> exit with 0" exit 0 - else - echo "FAILED: Image with tag ${VERSION} do not presented on docker.hub >> build will not started >> exit with 1" - exit 1 - fi shell: bash build-nonexample: @@ -120,11 +114,11 @@ jobs: run: | set -eux export PRODUCT_EDITION=${{ matrix.edition }} - export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL_OLD }}/testing/ubuntu + export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL }}/test export DOCKERFILE=Dockerfile export BASE_IMAGE=ubuntu:20.04 export PG_VERSION=12 export TAG=${{ github.event.inputs.tag }} - export PACKAGE_VERSION=$( echo ${TAG} | sed -E 's/(.*)\./\1-/') + export PACKAGE_VERSION=$( echo ${TAG} | sed -E 's/(.*)\./\1-/')~stretch docker buildx bake -f docker-bake.hcl documentserver-ucs --push shell: bash diff --git a/Dockerfile b/Dockerfile index a0e2156..b798712 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,13 +12,8 @@ ARG ONLYOFFICE_VALUE=onlyoffice RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ apt-get -y update && \ apt-get -yq install wget apt-transport-https gnupg locales lsb-release && \ - mkdir -p $HOME/.gnupg && \ - gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/onlyoffice.gpg --keyserver keyserver.ubuntu.com --recv-keys 0x8320ca65cb2de8e5 && \ - chmod 644 /etc/apt/trusted.gpg.d/onlyoffice.gpg && \ locale-gen en_US.UTF-8 && \ echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \ - wget -O - https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.deb.sh | bash && \ - if [ $(lsb_release -cs) = focal ]; then RABBITMQ_VERSION=3.8.11-1; else RABBITMQ_VERSION=3.9 ; fi && \ apt-get -yq install \ adduser \ apt-utils \ @@ -47,7 +42,7 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ postgresql \ postgresql-client \ pwgen \ - rabbitmq-server=${RABBITMQ_VERSION}* \ + rabbitmq-server \ redis-server \ software-properties-common \ sudo \