added agola ci, cron env and apache error to stdout https://git.mxfox.ru/Infrastructure/fox-web-basic/issues/2#issue-28 https://git.mxfox.ru/Infrastructure/fox-web-basic/issues/1#issue-27
agola/fox-web-basic/Build image The run finished successfully
Details
agola/fox-web-basic/Build image The run finished successfully
Details
This commit is contained in:
parent
f9b3ecf8d5
commit
03f7bc78d0
|
@ -0,0 +1,47 @@
|
||||||
|
version: v0
|
||||||
|
runs:
|
||||||
|
- name: Build image
|
||||||
|
docker_registries_auth:
|
||||||
|
'mxfox.ru':
|
||||||
|
username:
|
||||||
|
from_variable: mxfoxdockerlogin
|
||||||
|
password:
|
||||||
|
from_variable: mxfoxdockersecret
|
||||||
|
tasks:
|
||||||
|
- name: build docker image
|
||||||
|
runtime:
|
||||||
|
containers:
|
||||||
|
- image: mxfox.ru/test/docker-buildx:dind-git
|
||||||
|
privileged: true
|
||||||
|
#shell: /busybox/sh
|
||||||
|
working_dir: /workspace
|
||||||
|
environment:
|
||||||
|
DOCKERLOGIN:
|
||||||
|
from_variable: mxfoxdockerlogin
|
||||||
|
DOCKERPASS:
|
||||||
|
from_variable: mxfoxdockersecret
|
||||||
|
steps:
|
||||||
|
- clone:
|
||||||
|
- run:
|
||||||
|
name: buildX prepare
|
||||||
|
command: buildx-bgstart.sh
|
||||||
|
|
||||||
|
- run:
|
||||||
|
name: buildX build
|
||||||
|
command: |
|
||||||
|
case ${AGOLA_GIT_BRANCH} in
|
||||||
|
master)
|
||||||
|
export xBuildSuffix=" -t mxfox.ru/chimera/fox-web-basic:master-${AGOLA_GIT_COMMITSHA:0:10} -t mxfox.ru/chimera/fox-web-basic:latest --push"
|
||||||
|
;;
|
||||||
|
test)
|
||||||
|
export xBuildSuffix=" -t mxfox.ru/chimera/fox-web-basic:test-${AGOLA_GIT_COMMITSHA:0:10} -t mxfox.ru/chimera/fox-web-basic:test --push"
|
||||||
|
;;
|
||||||
|
php7.4)
|
||||||
|
export xBuildSuffix=" -t mxfox.ru/chimera/fox-web-basic:php-7.4-${AGOLA_GIT_COMMITSHA:0:10} -t mxfox.ru/chimera/fox-web-basic:php-7.4 --push"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
export xBuildSuffix=""
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
docker login mxfox.ru -u ${DOCKERLOGIN} -p ${DOCKERPASS}
|
||||||
|
docker buildx build --platform linux/amd64,linux/arm64 . ${xBuildSuffix}
|
|
@ -1,6 +1,6 @@
|
||||||
FROM ubuntu:20.04
|
FROM ubuntu:20.04
|
||||||
|
|
||||||
ENV php_version=7.4
|
ENV php_version=8.1
|
||||||
|
|
||||||
COPY ["/rootfs/etc/timezone", "/rootfs/etc/localtime", "/etc/"]
|
COPY ["/rootfs/etc/timezone", "/rootfs/etc/localtime", "/etc/"]
|
||||||
|
|
||||||
|
@ -29,7 +29,8 @@ RUN apt-get update -y \
|
||||||
&& apt-get autoremove -y \
|
&& apt-get autoremove -y \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
&& rm -rf /var/www/html/* \
|
&& rm -rf /var/www/html/* \
|
||||||
&& a2enmod rewrite
|
&& a2enmod rewrite \
|
||||||
|
&& sed -i -e 's/^ErrorLog.*$/ErrorLog \/dev\/stdout/g' /etc/apache2/apache2.conf
|
||||||
|
|
||||||
COPY rootfs /
|
COPY rootfs /
|
||||||
WORKDIR /var/www/html
|
WORKDIR /var/www/html
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
echo -n "Copying FOX ENV...";
|
||||||
|
env | grep -E "^FOX_" > /etc/security/pam_env.conf
|
||||||
|
echo "OK"
|
||||||
|
|
||||||
find /etc/fox-start.d -maxdepth 1 -type f -exec {} \;
|
find /etc/fox-start.d -maxdepth 1 -type f -exec {} \;
|
||||||
echo "Starting cron:"
|
echo "Starting cron:"
|
||||||
|
|
Loading…
Reference in New Issue