Lea/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add architecture and URL processing

Browse source
This commit is contained in:
danilapog 2022-07-15 11:16:47 +03:00
parent f5863dc1eb
commit 475d6d56bf
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/4testing-build.yml vendored
View file

@ -46,11 +46,11 @@ jobs:
DOCKER_TAG=$(echo ${{ env.RELEASE_VERSION }} | sed 's/^.//' ) DOCKER_TAG=$(echo ${{ env.RELEASE_VERSION }} | sed 's/^.//' )
PACKAGE_VERSION=$( echo $DOCKER_TAG | sed -E 's/(.*)\./\1-/' ) PACKAGE_VERSION=$( echo $DOCKER_TAG | sed -E 's/(.*)\./\1-/' )
if [[ ${{ env.RELEASE_VERSION }} == v99.99* ]]; then if [[ ${{ env.RELEASE_VERSION }} == v99.99* ]]; then
sed -i "s|http://download.onlyoffice.com/install/documentserver/linux/\${COMPANY_NAME}-\${PRODUCT_NAME}\${PRODUCT_EDITION}|${{ secrets.UNSTABLE_REPO_URL }}${{ matrix.edition }}_$PACKAGE_VERSION|g" Dockerfile
PACKAGE_URL=${{ secrets.UNSTABLE_REPO_URL }}${{ matrix.edition }}_"$PACKAGE_VERSION"_amd64.deb PACKAGE_URL=${{ secrets.UNSTABLE_REPO_URL }}${{ matrix.edition }}_"$PACKAGE_VERSION"_amd64.deb
URL_ARG=${{ secrets.UNSTABLE_REPO_URL }}${{ matrix.edition }}_"$PACKAGE_VERSION"_TARGETARCH.deb
else else
sed -i "s|http://download.onlyoffice.com/install/documentserver/linux/\${COMPANY_NAME}-\${PRODUCT_NAME}\${PRODUCT_EDITION}|${{ secrets.REPO_URL }}${{ matrix.edition }}_$PACKAGE_VERSION|g" Dockerfile
PACKAGE_URL=${{ secrets.REPO_URL }}${{ matrix.edition }}_"$PACKAGE_VERSION"_amd64.deb PACKAGE_URL=${{ secrets.REPO_URL }}${{ matrix.edition }}_"$PACKAGE_VERSION"_amd64.deb
URL_ARG=${{ secrets.REPO_URL }}${{ matrix.edition }}_"$PACKAGE_VERSION"_TARGETARCH.deb
fi fi
STATUS=$(curl -s -o /dev/null -w "%{http_code}\n" "$PACKAGE_URL") STATUS=$(curl -s -o /dev/null -w "%{http_code}\n" "$PACKAGE_URL")
if [[ "$STATUS" = "200" ]]; then if [[ "$STATUS" = "200" ]]; then
@ -96,7 +96,7 @@ jobs:
PRODUCT_EDITION=${{ matrix.edition }} COMPANY_NAME=${{ env.COMPANY_NAME }} \ PRODUCT_EDITION=${{ matrix.edition }} COMPANY_NAME=${{ env.COMPANY_NAME }} \
PRODUCT_NAME=${{ env.PRODUCT_NAME }} DOCKERFILE=Dockerfile \ PRODUCT_NAME=${{ env.PRODUCT_NAME }} DOCKERFILE=Dockerfile \
PREFIX_NAME=4testing- TAG=$DOCKER_TAG PLATFORM=$PLATFORM \ PREFIX_NAME=4testing- TAG=$DOCKER_TAG PLATFORM=$PLATFORM \
docker buildx bake \ PACKAGE_URL=${URL_ARG} docker buildx bake \
-f docker-bake.hcl ${{ matrix.images }} \ -f docker-bake.hcl ${{ matrix.images }} \
--print --print
@ -105,7 +105,7 @@ jobs:
PRODUCT_EDITION=${{ matrix.edition }} COMPANY_NAME=${{ env.COMPANY_NAME }} \ PRODUCT_EDITION=${{ matrix.edition }} COMPANY_NAME=${{ env.COMPANY_NAME }} \
PRODUCT_NAME=${{ env.PRODUCT_NAME }} DOCKERFILE=Dockerfile \ PRODUCT_NAME=${{ env.PRODUCT_NAME }} DOCKERFILE=Dockerfile \
PREFIX_NAME=4testing- TAG=$DOCKER_TAG PLATFORM=$PLATFORM \ PREFIX_NAME=4testing- TAG=$DOCKER_TAG PLATFORM=$PLATFORM \
docker buildx bake \ PACKAGE_URL=${URL_ARG} docker buildx bake \
-f docker-bake.hcl ${{ matrix.images }} \ -f docker-bake.hcl ${{ matrix.images }} \
--push --push
echo "DONE: Build success >> exit with 0" echo "DONE: Build success >> exit with 0"

4
Dockerfile
View file

@ -81,7 +81,9 @@ ENV COMPANY_NAME=$COMPANY_NAME \
PRODUCT_NAME=$PRODUCT_NAME \ PRODUCT_NAME=$PRODUCT_NAME \
PRODUCT_EDITION=$PRODUCT_EDITION PRODUCT_EDITION=$PRODUCT_EDITION
RUN wget -q -P /tmp "$PACKAGE_URL" && \ RUN if [ $(uname -m) = "x86_64" ] ; then ARCH=amd64 ; else ARCH=arm64 ; fi && \
PACKAGE_URL=$( echo $PACKAGE_URL | sed "s/TARGETARCH/"${ARCH}"/g") && \
wget -q -P /tmp "$PACKAGE_URL" && \
apt-get -y update && \ apt-get -y update && \
service postgresql start && \ service postgresql start && \
apt-get -yq install /tmp/$(basename "$PACKAGE_URL") && \ apt-get -yq install /tmp/$(basename "$PACKAGE_URL") && \

5
docker-bake.hcl
View file

@ -34,6 +34,10 @@ variable "PLATFORM" {
default = "" default = ""
} }
variable "PACKAGE_URL" {
default = ""
}
target "documentserver" { target "documentserver" {
target = "documentserver" target = "documentserver"
dockerfile= "${DOCKERFILE}" dockerfile= "${DOCKERFILE}"
@ -43,6 +47,7 @@ target "documentserver" {
"PRODUCT_EDITION": "${PRODUCT_EDITION}" "PRODUCT_EDITION": "${PRODUCT_EDITION}"
"PRODUCT_NAME": "${PRODUCT_NAME}" "PRODUCT_NAME": "${PRODUCT_NAME}"
"COMPANY_NAME": "${COMPANY_NAME}" "COMPANY_NAME": "${COMPANY_NAME}"
"PACKAGE_URL": "{PACKAGE_URL}"
"PLATFORM": "${PLATFORM}" "PLATFORM": "${PLATFORM}"
} }
} }