File tree Expand file tree Collapse file tree 3 files changed +18
-12
lines changed Expand file tree Collapse file tree 3 files changed +18
-12
lines changed Original file line number Diff line number Diff line change @@ -29,13 +29,22 @@ jobs:
29
29
- uses : actions/checkout@v2
30
30
with :
31
31
ref : ${{ github.event.inputs.ref || 'master' }}
32
+ - name : Set up QEMU
33
+ uses : docker/setup-qemu-action@v3
34
+
35
+ - name : Set up Docker Buildx
36
+ uses : docker/setup-buildx-action@v3
37
+
32
38
- name : Docker Login
33
39
uses : docker/login-action@v1.10.0
34
40
with :
35
41
registry : ghcr.io
36
42
username : ${{ github.actor }}
37
43
password : ${{ secrets.GITHUB_TOKEN }}
38
- - name : Build the Docker image
39
- run : docker build . --file Dockerfile --tag ghcr.io/universityradioyork/myradio/dev-base:${{ github.event.inputs.docker-tag || 'latest' }}
40
- - name : Push
41
- run : docker push ghcr.io/universityradioyork/myradio/dev-base:${{ github.event.inputs.docker-tag || 'latest' }}
44
+
45
+ - name : Build and push
46
+ uses : docker/build-push-action@v6
47
+ with :
48
+ platforms : linux/amd64,linux/arm64
49
+ push : true
50
+ tags : ghcr.io/universityradioyork/myradio/dev-base:${{ github.event.inputs.docker-tag || 'latest' }}
Original file line number Diff line number Diff line change @@ -33,6 +33,9 @@ RUN openssl req -nodes -new -subj "/C=GB/ST=North Yorkshire/L=York/O=University
33
33
34
34
RUN a2enmod rewrite ssl
35
35
36
+ # Fixes for running on ARM
37
+ RUN echo "Mutex posixsem" >> /etc/apache2/apache2.conf
38
+
36
39
COPY sample_configs/apache.conf /etc/apache2/sites-available/myradio.conf
37
40
RUN a2dissite 000-default && a2ensite myradio && \
38
41
service apache2 restart && apachectl -S
Original file line number Diff line number Diff line change @@ -9,13 +9,6 @@ RUN docker-php-ext-install pgsql pdo_pgsql gd ldap curl xsl zip
9
9
RUN pecl install memcached && \
10
10
echo extension=memcached.so >> /usr/local/etc/php/conf.d/memcached.ini
11
11
12
- RUN pecl install xdebug-3.3.1 && docker-php-ext-enable xdebug \
13
- && echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20220829/xdebug.so"' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
14
- && echo 'xdebug.client_port=9003' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
15
- && echo 'xdebug.mode=develop,debug' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
16
- && echo 'xdebug.start_with_request=yes' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
17
- && echo 'xdebug.client_host=localhost' >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
18
-
19
12
RUN echo 'error_reporting=E_ALL' >> /usr/local/etc/php/conf.d/error-reporting.ini
20
13
21
14
RUN echo "memory_limit=512M" >> /usr/local/etc/php/conf.d/uploads.ini
@@ -40,7 +33,8 @@ RUN a2dissite 000-default && a2ensite myradio && \
40
33
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
41
34
42
35
RUN mkdir -p /var/www/myradio && chown -R www-data:www-data /var/www/myradio && \
43
- mkdir -p /var/log/myradio && chown -R www-data:www-data /var/log/myradio
36
+ mkdir -p /var/log/myradio && chown -R www-data:www-data /var/log/myradio && \
37
+ ln -s /var/log/myradio/errors.log /dev/stderr
44
38
45
39
WORKDIR /var/www/myradio
46
40
COPY composer.* /var/www/myradio/
You can’t perform that action at this time.
0 commit comments