Compare commits
15 Commits
developmen
...
w/8.2/feat
Author | SHA1 | Date |
---|---|---|
Nicolas Humbert | 33ea79f4f8 | |
Nicolas Humbert | 59b29207a1 | |
Nicolas Humbert | 8d692760df | |
Nicolas Humbert | 38b8bfbe4c | |
Nicolas Humbert | 3facd1c326 | |
Nicolas Humbert | a566b8e05c | |
bert-e | 95fb3a2ebf | |
Nicolas Humbert | 648245d80a | |
Nicolas Humbert | 5a5d344fb3 | |
Nicolas Humbert | cc244f79f5 | |
Nicolas Humbert | 782ec1d859 | |
Nicolas Humbert | 4fa3380d4a | |
Nicolas Humbert | f8da9a31d8 | |
Nicolas Humbert | e6c1f4101a | |
Nicolas Humbert | 66395e85a4 |
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"extends": "scality",
|
||||
"rules": {
|
||||
"import/extensions": "off",
|
||||
"lines-around-directive": "off",
|
||||
"no-underscore-dangle": "off",
|
||||
"indent": "off",
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM node:10.22.0-slim
|
||||
FROM node:16.13.2-slim
|
||||
MAINTAINER Giorgio Regni <gr@scality.com>
|
||||
|
||||
ENV NO_PROXY localhost,127.0.0.1
|
||||
|
|
|
@ -13,7 +13,7 @@ RUN curl -sS http://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
|
|||
&& update-ca-certificates \
|
||||
&& git clone https://github.com/tj/n.git \
|
||||
&& make -C ./n \
|
||||
&& n 10.22.0 \
|
||||
&& n 16.13.2 \
|
||||
&& pip install pip==9.0.1 \
|
||||
&& rm -rf ./n \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
|
@ -32,6 +32,7 @@ RUN adduser -u 1042 --home /home/eve --disabled-password --gecos "" eve \
|
|||
|
||||
# Install RVM and gems
|
||||
ENV RUBY_VERSION="2.5.0"
|
||||
RUN gem update --system
|
||||
|
||||
RUN gpg2 --keyserver hkp://pgp.mit.edu --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
|
||||
&& curl -sSL https://get.rvm.io | bash -s stable --ruby=$RUBY_VERSION \
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
nokogiri:1.12.5
|
||||
fog-aws:1.3.0
|
||||
json
|
||||
mime-types:3.1
|
||||
|
|
|
@ -11,3 +11,5 @@ redis-server
|
|||
yarn
|
||||
zlib1g-dev
|
||||
jq
|
||||
openssl
|
||||
ruby-full
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM python:3-alpine
|
||||
FROM python:3.10-alpine
|
||||
|
||||
RUN apk add --no-cache \
|
||||
libressl && \
|
||||
|
|
|
@ -4,7 +4,7 @@ port=5696
|
|||
certificate_path=/ssl/kmip-cert.pem
|
||||
key_path=/ssl/kmip-key.pem
|
||||
ca_path=/ssl/kmip-ca.pem
|
||||
auth_suite=Basic
|
||||
auth_suite=TLS1.2
|
||||
policy_path=/etc/pykmip/policies
|
||||
enable_tls_client_auth=True
|
||||
database_path=/pykmip/pykmip.db
|
||||
|
|
23
package.json
23
package.json
|
@ -4,7 +4,7 @@
|
|||
"description": "Zenko CloudServer, an open-source Node.js implementation of a server handling the Amazon S3 protocol",
|
||||
"main": "index.js",
|
||||
"engines": {
|
||||
"node": ">=10.19.0"
|
||||
"node": ">=16"
|
||||
},
|
||||
"repository": "scality/S3",
|
||||
"keywords": [
|
||||
|
@ -20,12 +20,12 @@
|
|||
"homepage": "https://github.com/scality/S3#readme",
|
||||
"dependencies": {
|
||||
"@hapi/joi": "^17.1.0",
|
||||
"arsenal": "github:scality/Arsenal#8.1.25",
|
||||
"arsenal": "github:scality/Arsenal#w/8.1/feature/ARSN-21/UpgradeToNode16",
|
||||
"async": "~2.5.0",
|
||||
"aws-sdk": "2.905.0",
|
||||
"azure-storage": "^2.1.0",
|
||||
"bucketclient": "scality/bucketclient#8.1.0",
|
||||
"bufferutil": "^3.0.5",
|
||||
"bucketclient": "scality/bucketclient#w/8.1/improvement/BKTCLT-3-upgrade-to-node-16",
|
||||
"bufferutil": "^4.0.6",
|
||||
"commander": "^2.9.0",
|
||||
"cron-parser": "^2.11.0",
|
||||
"diskusage": "1.1.3",
|
||||
|
@ -42,11 +42,11 @@
|
|||
"prom-client": "^10.2.3",
|
||||
"request": "^2.81.0",
|
||||
"sql-where-parser": "~2.2.1",
|
||||
"utapi": "github:scality/utapi#8.1.4",
|
||||
"utf-8-validate": "^4.0.2",
|
||||
"utapi": "github:scality/utapi#w/8.1/feature/UTAPI-59/UpgradeToNode16",
|
||||
"utf-8-validate": "^5.0.8",
|
||||
"utf8": "~2.1.1",
|
||||
"uuid": "^8.3.2",
|
||||
"vaultclient": "scality/vaultclient#62e8d4a",
|
||||
"vaultclient": "scality/vaultclient#w/8.2/feature/VLTCLT-7/UpgradeToNode16",
|
||||
"werelogs": "scality/werelogs#8.1.0",
|
||||
"ws": "^5.1.0",
|
||||
"xml2js": "~0.4.16"
|
||||
|
@ -55,7 +55,7 @@
|
|||
"bluebird": "^3.3.1",
|
||||
"eslint": "^5.3.0",
|
||||
"eslint-config-airbnb-base": "^13.1.0",
|
||||
"eslint-config-scality": "scality/Guidelines#28e73a2",
|
||||
"eslint-config-scality": "scality/Guidelines#w/8.2/improvement/GDL-5-node-16-upgrade",
|
||||
"eslint-plugin-import": "^2.14.0",
|
||||
"express": "^4.17.1",
|
||||
"ioredis": "4.9.5",
|
||||
|
@ -69,11 +69,6 @@
|
|||
"sinon": "^9.2.4",
|
||||
"tv4": "^1.2.7"
|
||||
},
|
||||
"resolutions": {
|
||||
"ioctl": "^2.0.2",
|
||||
"npmlog": "4.1.2",
|
||||
"@npmcli/fs": "1.0.0"
|
||||
},
|
||||
"scripts": {
|
||||
"cloudserver": "S3METADATA=mongodb npm-run-all --parallel start_dataserver start_s3server",
|
||||
"ft_awssdk": "cd tests/functional/aws-node-sdk && mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json test/",
|
||||
|
@ -118,4 +113,4 @@
|
|||
"unit_coverage": "CI=true mkdir -p coverage/unit/ && S3BACKEND=mem istanbul cover --dir coverage/unit _mocha -- --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json --recursive tests/unit",
|
||||
"unit_coverage_legacy_location": "CI=true mkdir -p coverage/unitlegacylocation/ && S3_LOCATION_FILE=tests/locationConfig/locationConfigLegacy.json S3BACKEND=mem istanbul cover --dir coverage/unitlegacylocation _mocha -- --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json --reporter mocha-junit-reporter --recursive tests/unit"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue