Skip to content

Commit 3d020bb

Browse files
author
Raileen Del Rosario
committed
2 parents 03d5223 + 0998025 commit 3d020bb

File tree

7 files changed

+357
-520
lines changed

7 files changed

+357
-520
lines changed

.github/workflows/php.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@ permissions:
1111

1212
jobs:
1313
build:
14-
1514
runs-on: ubuntu-latest
1615

1716
steps:
1817
- uses: actions/checkout@v3
1918

19+
- name: Set up PHP
20+
uses: shivammathur/setup-php@v2
21+
with:
22+
php-version: '8.2'
23+
2024
- name: Cache Composer packages
2125
id: composer-cache
2226
uses: actions/cache@v3
@@ -39,4 +43,4 @@ jobs:
3943
PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
4044
SIGNER_EMAIL: ${{ secrets.SIGNER_EMAIL }}
4145
SIGNER_NAME: ${{ secrets.SIGNER_NAME }}
42-
run: composer run-script test
46+
run: composer run-script test

Dockerfile

+10-11
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ FROM composer:2 as composer_stage
33
RUN rm -rf /var/www && mkdir -p /var/www/html
44
WORKDIR /var/www/html
55

6-
7-
FROM php:8.1.6RC1-fpm-alpine3.15
6+
FROM php:8.2-fpm-alpine
87

98
# Install dev dependencies
109
RUN apk add --no-cache --virtual .build-deps \
1110
$PHPIZE_DEPS \
1211
curl-dev \
1312
imagemagick-dev \
1413
libtool \
15-
libxml2-dev
14+
libxml2-dev \
15+
linux-headers # Add linux-headers here
1616

1717
# Install production dependencies
1818
RUN apk add --no-cache \
@@ -36,15 +36,15 @@ RUN pecl install \
3636
imagick \
3737
xdebug
3838

39-
# We currently can't natively pull iconv with PHP8, see: https://github.com/docker-library/php/issues/240#issuecomment-876464325
39+
# Workaround for iconv with PHP8
4040
RUN apk add gnu-libiconv=1.15-r3 --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.13/community/ --allow-untrusted
4141
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so
4242

43-
# Install and enable php extensions
43+
# Install and enable PHP extensions
4444
RUN docker-php-ext-enable \
4545
imagick \
4646
xdebug
47-
RUN docker-php-ext-configure zip
47+
RUN docker-php-ext-configure zip
4848
RUN docker-php-ext-install \
4949
curl \
5050
pdo \
@@ -53,16 +53,15 @@ RUN docker-php-ext-install \
5353
xml \
5454
gd \
5555
zip \
56-
bcmath
56+
bcmath
5757

5858
WORKDIR /var/www/html
5959
COPY src src/
6060
COPY --from=composer_stage /usr/bin/composer /usr/bin/composer
6161
COPY composer.json /var/www/html/
62-
# This are production settings, I'm running with 'no-dev', adjust accordingly
63-
# if you need it
64-
RUN composer install
62+
# Install composer dependencies
63+
RUN composer install --no-dev --optimize-autoloader
6564

6665
CMD ["php-fpm"]
6766

68-
EXPOSE 9000
67+
EXPOSE 9000

Quick_ACG/composer.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
2-
"autoload": {
3-
"psr-4": {"DocuSign\\": "../src/",
4-
"QuickACG\\": "src/"
5-
}
6-
},
7-
8-
"require": {
9-
"docusign/esign-client": "^8.0.0",
10-
"twig/twig": "^3.11.0",
11-
"league/oauth2-client": "^2.7.0",
12-
"ext-json": "*",
13-
"guzzlehttp/guzzle": "7.9.2",
14-
"mashape/unirest-php": "3.0.4"
2+
"autoload": {
3+
"psr-4": {
4+
"DocuSign\\": "../src/",
5+
"QuickACG\\": "src/"
156
}
7+
},
8+
"require": {
9+
"docusign/esign-client": "^8.0.0",
10+
"twig/twig": "^3.14.0",
11+
"league/oauth2-client": "^2.7.0",
12+
"ext-json": "*",
13+
"guzzlehttp/guzzle": "7.9.2",
14+
"mashape/unirest-php": "3.0.4"
15+
}
1616
}

0 commit comments

Comments
 (0)