Skip to content

Commit 95d36a0

Browse files
Red-GVjulianocosta89
authored andcommitted
[quote]: replace debian image with latest alpine image (open-telemetry#2216)
Signed-off-by: Gerard Vanloo <gerard.vanloo@ibm.com> Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
1 parent e6e471b commit 95d36a0

2 files changed

Lines changed: 29 additions & 23 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,18 @@ the release.
2525
([#2170](https://github.com/open-telemetry/opentelemetry-demo/pull/2170))
2626
* [chore] bump dependent images
2727
([#2179](https://github.com/open-telemetry/opentelemetry-demo/pull/2179))
28+
* [image-provider]: replace bookworm image with nonroot alpine image
29+
([2193](https://github.com/open-telemetry/opentelemetry-demo/pull/2193))
30+
* [kafka] update image to latest
31+
([2194](https://github.com/open-telemetry/opentelemetry-demo/pull/2194))
2832
* [email] bump ruby and dependencies to latest and switch to alpine
2933
([#2196](https://github.com/open-telemetry/opentelemetry-demo/pull/2196))
3034
* [cartservice] Upgrade OpenFeature version and change Hooks integration
3135
([#2199](https://github.com/open-telemetry/opentelemetry-demo/pull/2199))
32-
* [kafka] update image to latest
33-
([2194](https://github.com/open-telemetry/opentelemetry-demo/pull/2194))
3436
* [shipping] refactor service to use actix-web and demo instrumentation library
3537
([2214](https://github.com/open-telemetry/opentelemetry-demo/pull/2214))
36-
* [image-provider]: replace bookworm image with nonroot alpine image
37-
([2193](https://github.com/open-telemetry/opentelemetry-demo/pull/2193))
38+
* [quote] replace debian image with latest alpine image
39+
([2216](https://github.com/open-telemetry/opentelemetry-demo/pull/2216))
3840

3941
## 2.0.2
4042

src/quote/Dockerfile

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,13 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44

5-
FROM php:8.3-cli AS base
5+
FROM ghcr.io/mlocati/php-extension-installer:2.7.34 AS installer
66

7-
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
8-
RUN chmod +x /usr/local/bin/install-php-extensions \
9-
&& install-php-extensions \
10-
opcache \
11-
pcntl \
12-
protobuf \
13-
opentelemetry
14-
15-
WORKDIR /var/www
16-
CMD ["php", "public/index.php"]
17-
USER www-data
18-
EXPOSE ${QUOTE_PORT}
19-
20-
FROM composer:2.7 AS vendor
7+
FROM composer:2.8.9 AS vendor
218

229
WORKDIR /tmp/
23-
COPY ./src/quote/composer.json .
10+
11+
COPY ./src/quote/composer.json composer.json
2412

2513
RUN composer install \
2614
--ignore-platform-reqs \
@@ -30,6 +18,22 @@ RUN composer install \
3018
--no-dev \
3119
--prefer-dist
3220

33-
FROM base AS final
34-
COPY --from=vendor /tmp/vendor/ ./vendor/
35-
COPY ./src/quote/ /var/www
21+
FROM php:8.4-cli-alpine3.21
22+
23+
COPY --from=installer /usr/bin/install-php-extensions /usr/local/bin/
24+
25+
RUN install-php-extensions opcache pcntl protobuf opentelemetry
26+
27+
WORKDIR /var/www
28+
29+
USER www-data
30+
31+
COPY --from=vendor /tmp/vendor/ vendor/
32+
33+
COPY ./src/quote/app/ app/
34+
COPY ./src/quote/public/ public/
35+
COPY ./src/quote/src/ src/
36+
37+
EXPOSE ${QUOTE_PORT}
38+
39+
CMD ["php", "public/index.php"]

0 commit comments

Comments
 (0)