pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build failures.

pull/7636/head
Aditya Toshniwal 2024-06-27 18:03:10 +05:30 committed by GitHub
parent ccd84b7c2a
commit e8f108154d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@ -1,4 +1,3 @@
.git
web/node_modules web/node_modules
web/*.log web/*.log
web/regression web/regression

6
.github/workflows/check-container-build.yml vendored
View File

@ -20,7 +20,9 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 2 fetch-depth: 2
- run: git checkout HEAD^
- name: Build the container - name: Build the container
run: docker build . uses: docker/build-push-action@v6
with:
push: false
context: .

4
Dockerfile
View File

@ -31,6 +31,7 @@ RUN apk add --no-cache \
yarn \ yarn \
zlib-dev zlib-dev
COPY .git .git
# Create the /pgadmin4 directory and copy the source into it. Explicitly # Create the /pgadmin4 directory and copy the source into it. Explicitly
# remove the node_modules directory as we'll recreate a clean version, as well # remove the node_modules directory as we'll recreate a clean version, as well
# as various other files we don't want # as various other files we don't want
@ -60,7 +61,8 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
webpack.* \ webpack.* \
jest.config.js \ jest.config.js \
babel.* \ babel.* \
./pgadmin/static/js/generated/.cache ./pgadmin/static/js/generated/.cache \
/pgadmin4/.git
######################################################################### #########################################################################
# Next, create the base environment for Python # Next, create the base environment for Python

1
Makefile
View File

@ -118,6 +118,7 @@ debian:
docker: docker:
echo $(APP_NAME) echo $(APP_NAME)
git checkout HEAD
docker build --pull -t ${APP_NAME} -t $(APP_NAME):latest -t $(APP_NAME):$(APP_RELEASE) -t $(APP_NAME):$(APP_RELEASE).$(APP_REVISION) . docker build --pull -t ${APP_NAME} -t $(APP_NAME):latest -t $(APP_NAME):$(APP_RELEASE) -t $(APP_NAME):$(APP_RELEASE).$(APP_REVISION) .
docs: docs:

4
web/package.json
View File

@ -168,7 +168,7 @@
"bundle:watch": "yarn run linter && yarn run webpacker:watch", "bundle:watch": "yarn run linter && yarn run webpacker:watch",
"bundle:dev": "yarn run linter && yarn run webpacker", "bundle:dev": "yarn run linter && yarn run webpacker",
"bundle:analyze": "cross-env NODE_ENV=production ANALYZE=true yarn run bundle:dev", "bundle:analyze": "cross-env NODE_ENV=production ANALYZE=true yarn run bundle:dev",
"bundle": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=3072 yarn run bundle:dev && git log -1 --format='%H %as' > commit_hash", "bundle": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=3072 yarn run bundle:dev && git log -1 --format=\"%H %as\" > commit_hash",
"test:js-once": "yarn run linter && yarn run jest --maxWorkers=50%", "test:js-once": "yarn run linter && yarn run jest --maxWorkers=50%",
"test:js": "yarn run test:js-once --watch", "test:js": "yarn run test:js-once --watch",
"test:js-file": "yarn run test:js-once -t", "test:js-file": "yarn run test:js-once -t",
@ -181,5 +181,5 @@
"auditpy": "safety check --full-report -i 51668 -i 52495yarn npm audit", "auditpy": "safety check --full-report -i 51668 -i 52495yarn npm audit",
"audit-all": "yarn run auditjs && yarn run auditpy" "audit-all": "yarn run auditjs && yarn run auditpy"
}, },
"packageManager": "yarn@3.8.2" "packageManager": "yarn@3.8.3"
} }

4
web/yarn.lock
View File

@ -15979,11 +15979,11 @@ __metadata:
"typescript@patch:typescript@^5.4.5#~builtin<compat/typescript>": "typescript@patch:typescript@^5.4.5#~builtin<compat/typescript>":
version: 5.5.2 version: 5.5.2
resolution: "typescript@patch:typescript@npm%3A5.5.2#~builtin<compat/typescript>::version=5.5.2&hash=b45daf" resolution: "typescript@patch:typescript@npm%3A5.5.2#~builtin<compat/typescript>::version=5.5.2&hash=379a07"
bin: bin:
tsc: bin/tsc tsc: bin/tsc
tsserver: bin/tsserver tsserver: bin/tsserver
checksum: 9d89bac0de650e15d6846485f238d1e65f1013f2c260d9e53e86a1da6ecf8109d9fad9402575c5c36a6592dc5d4370db090e12971c8630ae84453654baabb6b4 checksum: d8c8af1adb92ef36998cc9293ad8607dda68564ecc2f315a7298d6d40edae1906e0ed88e0b2b02da686adc61d638cbecb82b4c694d5bccc621b8baf6e6274f7c
languageName: node languageName: node
linkType: hard linkType: hard