Skip to content

Commit cac4d13

Browse files
committed
Debug base image
1 parent 0eca37b commit cac4d13

File tree

1 file changed

+36
-40
lines changed

1 file changed

+36
-40
lines changed

core/Dockerfile

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
ARG DOCKER_HUB_PROXY=""
22

33

4-
FROM "${DOCKER_HUB_PROXY}ubuntu:24.04" as php-base
5-
ENV DEBIAN_FRONTEND noninteractive
6-
ENV LC_ALL C.UTF-8
7-
8-
# Uncomment when building in corporate environments
9-
# COPY ./rootca.crt /usr/local/share/ca-certificates/rootca.pem
10-
# COPY ./rootca.crt /usr/lib/ssl/cert.pem
11-
12-
RUN apt-get update; apt-get upgrade; apt-get install -y --no-install-recommends \
13-
ca-certificates \
14-
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
15-
16-
COPY files/etc/apt/sources.list.d/ondrej-ubuntu-php-noble.sources /etc/apt/sources.list.d/ondrej-ubuntu-php-noble.sources
17-
COPY files/etc/apt/sources.list.d/ondrej-ubuntu-nginx-mainline-noble.sources /etc/apt/sources.list.d/ondrej-ubuntu-nginx-mainline-noble.sources
18-
19-
# RUN apt-get update; apt-get install -y --no-install-recommends \
20-
# software-properties-common
21-
# # && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
22-
# RUN add-apt-repository ppa:ondrej/php
23-
# RUN add-apt-repository ppa:ondrej/nginx-mainline
24-
RUN apt-get update
4+
# FROM "${DOCKER_HUB_PROXY}ubuntu:24.04" as php-base
5+
# ENV DEBIAN_FRONTEND noninteractive
6+
# ENV LC_ALL C.UTF-8
7+
#
8+
# # Uncomment when building in corporate environments
9+
# # COPY ./rootca.crt /usr/local/share/ca-certificates/rootca.pem
10+
# # COPY ./rootca.crt /usr/lib/ssl/cert.pem
11+
#
12+
# RUN apt-get update; apt-get upgrade; apt-get install -y --no-install-recommends \
13+
# ca-certificates \
14+
# && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
15+
#
16+
# # COPY files/etc/apt/sources.list.d/ondrej-ubuntu-php-noble.sources /etc/apt/sources.list.d/ondrej-ubuntu-php-noble.sources
17+
# # COPY files/etc/apt/sources.list.d/ondrej-ubuntu-nginx-mainline-noble.sources /etc/apt/sources.list.d/ondrej-ubuntu-nginx-mainline-noble.sources
18+
#
19+
# # RUN apt-get update; apt-get install -y --no-install-recommends \
20+
# # software-properties-common
21+
# # # && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
22+
# # RUN add-apt-repository ppa:ondrej/php
23+
# # RUN add-apt-repository ppa:ondrej/nginx-mainline
24+
# # RUN apt-get update
2525

2626

27-
FROM php-base as composer-build
27+
FROM "${DOCKER_HUB_PROXY}ubuntu:24.04" as composer-build
2828
ENV DEBIAN_FRONTEND noninteractive
2929
ENV COMPOSER_ALLOW_SUPERUSER 1
3030
ENV COMPOSER_IPRESOLVE 4
@@ -33,38 +33,34 @@ FROM php-base as composer-build
3333

3434
RUN apt-get update; apt-get install -y --no-install-recommends \
3535
ca-certificates \
36-
php7.4 \
37-
php7.4-apcu \
38-
php7.4-curl \
39-
php7.4-xml \
40-
php7.4-intl \
41-
php7.4-bcmath \
42-
php7.4-mbstring \
43-
php7.4-mysql \
44-
php7.4-redis \
45-
php7.4-gd \
46-
php7.4-fpm \
47-
php7.4-zip \
36+
php8.3 \
37+
php8.3-apcu \
38+
php8.3-curl \
39+
php8.3-xml \
40+
php8.3-intl \
41+
php8.3-bcmath \
42+
php8.3-mbstring \
43+
php8.3-mysql \
44+
php8.3-redis \
45+
php8.3-gd \
46+
php8.3-fpm \
47+
php8.3-zip \
4848
unzip
4949
# && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
5050

51-
COPY files/test.php /test.php
52-
RUN php7.4 /test.php
53-
5451
WORKDIR /tmp
5552
ADD https://raw.githubusercontent.com/MISP/MISP/${CORE_COMMIT:-${CORE_TAG}}/app/composer.json /tmp
5653
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
5754

58-
#RUN echo '140.82.113.6 api.github.com' >> /etc/hosts
5955
RUN cp /usr/bin/composer /composer.phar
6056
RUN mkdir /out/
6157
RUN php -r '$phar = new Phar("/composer.phar"); $phar->extractTo("/out/");'
6258

6359
COPY files/CurlDownloader.php /out/src/Composer/Util/Http/CurlDownloader.php
6460
RUN php /out/bin/composer config --no-interaction allow-plugins.composer/installers true
6561
RUN php /out/bin/composer config --no-interaction secure-http false
66-
RUN php /out/bin/composer install -vvvvv
67-
RUN php /out/bin/composer require --with-all-dependencies --no-interaction \
62+
RUN php /out/bin/composer install -vvvvv --ignore-platform-reqs
63+
RUN php /out/bin/composer require --ignore-platform-reqs --with-all-dependencies --no-interaction \
6864
supervisorphp/supervisor:^4.0 \
6965
guzzlehttp/guzzle \
7066
lstrojny/fxmlrpc \

0 commit comments

Comments
 (0)