Skip to content

Commit cdc5792

Browse files
committed
storage api client simplify dev dependencies
1 parent b951005 commit cdc5792

3 files changed

Lines changed: 1 addition & 67 deletions

File tree

Dockerfile

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,11 @@ ENV LC_ALL=C.UTF-8
2020
ENV LANG=C.UTF-8
2121

2222
RUN apt-get update -q \
23-
&& apt-get install gnupg -y --no-install-recommends \
24-
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
25-
&& curl https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list \
2623
&& apt-get update -q \
2724
&& ACCEPT_EULA=Y apt-get install \
2825
unzip \
2926
git \
30-
unixodbc \
31-
unixodbc-dev \
3227
libpq-dev \
33-
debsig-verify \
34-
dirmngr \
35-
msodbcsql17 \
36-
libonig-dev \
37-
libxml2-dev \
3828
-y --no-install-recommends \
3929
&& rm -r /var/lib/apt/lists/* \
4030
&& chmod +x /tmp/composer-install.sh \
@@ -43,46 +33,9 @@ RUN apt-get update -q \
4333
RUN echo "memory_limit = -1" >> /usr/local/etc/php/php.ini
4434

4535

46-
RUN docker-php-ext-install pdo_pgsql
47-
48-
# https://github.com/docker-library/php/issues/103#issuecomment-353674490
49-
RUN set -ex; \
50-
docker-php-source extract; \
51-
{ \
52-
echo '# https://github.com/docker-library/php/issues/103#issuecomment-353674490'; \
53-
echo 'AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl'; \
54-
echo; \
55-
cat /usr/src/php/ext/odbc/config.m4; \
56-
} > temp.m4; \
57-
mv temp.m4 /usr/src/php/ext/odbc/config.m4; \
58-
docker-php-ext-configure odbc --with-unixODBC=shared,/usr; \
59-
docker-php-ext-install odbc; \
60-
docker-php-source delete
61-
62-
63-
## install snowflake drivers
64-
COPY ./docker/snowflake/generic.pol /etc/debsig/policies/$SNOWFLAKE_GPG_KEY/generic.pol
65-
ADD https://sfc-repo.snowflakecomputing.com/odbc/linux/$SNOWFLAKE_ODBC_VERSION/snowflake-odbc-$SNOWFLAKE_ODBC_VERSION.x86_64.deb /tmp/snowflake-odbc.deb
66-
COPY ./docker/snowflake/simba.snowflake.ini /usr/lib/snowflake/odbc/lib/simba.snowflake.ini
67-
6836
# snowflake - charset settings
6937
ENV LANG en_US.UTF-8
7038

71-
RUN mkdir -p ~/.gnupg \
72-
&& chmod 700 ~/.gnupg \
73-
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
74-
&& mkdir -p /usr/share/debsig/keyrings/$SNOWFLAKE_GPG_KEY \
75-
&& if ! gpg --keyserver hkp://keys.gnupg.net --recv-keys $SNOWFLAKE_GPG_KEY; then \
76-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys $SNOWFLAKE_GPG_KEY; \
77-
fi \
78-
&& gpg --export $SNOWFLAKE_GPG_KEY > /usr/share/debsig/keyrings/$SNOWFLAKE_GPG_KEY/debsig.gpg \
79-
&& debsig-verify /tmp/snowflake-odbc.deb \
80-
&& gpg --batch --delete-key --yes $SNOWFLAKE_GPG_KEY \
81-
&& dpkg -i /tmp/snowflake-odbc.deb
82-
83-
# PHP modules
84-
RUN docker-php-ext-install bcmath
85-
8639
WORKDIR /code
8740

8841
## Composer - deps always cached unless changed

composer.json

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,11 @@
3737
"symfony/process": "^7.0||^6.0||^5.0||^4.0"
3838
},
3939
"require-dev": {
40-
"ext-bcmath": "*",
4140
"ext-curl": "*",
42-
"ext-pdo": "*",
43-
"ext-pdo_pgsql": "*",
44-
"brianium/paratest": "2.*|6.*",
45-
"flow-php/filesystem": "^0.21.0",
46-
"flow-php/parquet": "^0.21.0",
47-
"flow-php/types": "^0.21.0",
48-
"google/cloud-bigquery-analyticshub": "^0.1.0",
4941
"keboola/coding-standard": "^15.0",
50-
"keboola/kbc-manage-api-php-client": "^9.0",
51-
"keboola/php-csv-db-import": "^6",
52-
"keboola/phpunit-retry-annotations": "^0.5",
53-
"keboola/retry": "^0.5.0",
54-
"keboola/table-backend-utils": ">=2.9.0",
5542
"phpstan/phpstan": "^1",
5643
"phpstan/phpstan-phpunit": "^1.0",
57-
"phpunit/phpunit": "^7.0|^8.0|^9.0",
44+
"phpunit/phpunit": "^9.0|^10",
5845
"rector/rector": "^0.12.23",
5946
"squizlabs/php_codesniffer": "^3",
6047
"tomasfejfar/phpstan-phpunit": "^0.1.0"

phpunit.xml.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit backupGlobals="false"
3-
backupStaticAttributes="false"
43
colors="true"
5-
convertErrorsToExceptions="true"
6-
convertNoticesToExceptions="true"
7-
convertWarningsToExceptions="true"
84
processIsolation="false"
95
stopOnFailure="false"
106
stopOnError="false"
11-
syntaxCheck="false"
12-
verbose="true"
137
bootstrap="tests/bootstrap.php">
148

159
<testsuites>

0 commit comments

Comments
 (0)