Commit Graph

279 Commits

Author SHA1 Message Date
Dave Page
c0595e62ee Fix quoting. 2020-01-03 10:14:13 +00:00
Paresh More
f5afc51879 Ensure all binaries are securely signed and linked with the hardened runtime in the macOS bundle. Fixes #5060
Note that this is untested for automated builds, so may require further tweaks.
2020-01-03 09:56:45 +00:00
Dave Page
01c7636c75 Update copyright notices for 2020. 2020-01-02 14:43:50 +00:00
Levitt Olivier
e29ea15554 Fix an issue where servers.json import fails when running in desktop mode. 2019-12-17 13:15:04 +05:30
Dave Page
619c4e1180 Run pgAdmin in the container as a non-root user (pgadmin, UID: 5050). Fixes #4939. 2019-12-09 11:09:46 +05:30
Dave Page
246a475600 Allow Gunicorn logs in the container to be directed to a file specified through GUNICORN_ACCESS_LOGFILE. Fixes #4944 2019-12-02 20:14:01 -05:00
Dave Page
9bdb5ea5e0 Include PostgreSQL 12 binaries in the container. Fixes #4823 2019-10-11 11:13:06 +01:00
Dave Page
110a51c5b2 Refactor Dockerfile to avoid needing to run supporting scripts (i.e. 'docker build .' will work) and minimise layers. Fixes #4752 2019-09-16 13:48:11 +01:00
Dave Page
b4a754bdc0 Remove copy of file that's now created on the fly. 2019-09-09 13:35:55 -04:00
Dave Page
25f85fe123 Fix PGADMIN_SERVER_JSON_FILE environment variable support in the container. Fixes #4657 2019-08-23 09:53:24 +01:00
Dave Page
c76b30e353 Allow configuration options to be set from the environment in the container distribution. Fixes #4651 2019-08-22 15:24:04 +01:00
Aditya Toshniwal
15556f9f89 Correct the condition to compare version for Windows installer. Regression of last commit. 2019-07-02 20:12:00 +05:30
Aditya Toshniwal
b76e0bea83 Ensure the version comparision should be correct for windows installer. Fixes #4421 2019-07-02 14:58:18 +05:30
Andrew Coleman
d397959f6a Allow the path to /pgadmin4/servers.json to be overridden in the container distribution. Fixes #4400 2019-06-27 10:56:37 -04:00
Dave Page
2fa849dc26 Also need openssl-dev 2019-05-28 18:11:42 -04:00
Dave Page
f340cd044b build-deps doesn't exist any more. 2019-05-28 18:09:06 -04:00
Dave Page
991f667f9f Argh, they are Alpine packages, not Python. 2019-05-28 18:01:56 -04:00
Dave Page
307637b969 Looks like we also need build tools for the cryptography module. 2019-05-28 17:56:54 -04:00
Dave Page
91595593d3 Doc builds now need the cryptography module. 2019-05-28 17:50:11 -04:00
Dave Page
1a192109d6 Ensure we create a DMG file that's compatible with macOS 10.10+ 2019-04-15 12:12:46 +01:00
Dave Page
ded446fe8a Depend on psycopg2-binary in the Python wheel, rather than psycopg2. Fixes #4165 2019-04-11 10:08:44 +01:00
Dave Page
b917246be9 Add missing closing brace. 2019-03-26 10:25:50 -04:00
Dave Page
17464aa034 Don't use old-style variable notation. 2019-03-21 14:02:19 +00:00
Dave Page
48c3763e95 Remove the dependency on importlib for Python <= 2.7. It's not actually required. 2019-03-20 11:58:09 +00:00
Dave Page
bb1e908b54 Apply codestyle checks to all Python code. 2019-03-20 11:17:51 +00:00
Dave Page
b3c3b69a36 Bail out if yarn returns a non-zero code. 2019-03-15 09:20:13 +00:00
Dave Page
d8f9e3e87b Optimise the Docker file to minimise the number of layers and maximise the chances that changes will be in the last layers built. 2019-03-01 12:29:05 +00:00
Dave Page
f552519ed6 Set the Gunicorn worker timeout to match the configured session expiry. Partially fixes #3656 2019-03-01 11:55:17 +00:00
Dave Page
a39f43788b Include multiple versions of the PG utilties in containers. Fixes #3886 2019-02-20 15:17:16 +00:00
Dave Page
aae49b5324 Update Docker README to match reality. 2019-02-20 14:51:36 +00:00
Dave Page
438116c574 Update Alpine Linux version in the docker container. This also updates the PG utilities to v11. Fixes #3991 2019-02-13 17:18:14 +00:00
Dave Page
e0e7d6f1f6 Install a script to start pgAdmin (pgadmin4) from the command line when installed from the Python wheel. Fixes #1825 2019-02-12 14:04:45 +00:00
Dave Page
cbfa614cf9 Ensure we use PIP 18.1 in the Docker build because of https://github.com/pypa/pip/issues/6197 2019-01-31 14:28:20 +01:00
Diego Augusto Molina
da3b3de397 Expose the bind address in the Docker container via PGADMIN_BIND_ADDRESS. Fixes #3955 2019-01-31 14:26:35 +01:00
Cyril Jouve
cbd8f8236a Remove Python 2.6 code that's now obsolete. Fixes #3935 2019-01-31 13:47:56 +01:00
Dave Page
365cbc34f5 Fix MacOS package copyright. 2019-01-07 14:37:43 +05:30
Dave Page
c5d49bd862 Fix copyright year. 2019-01-07 11:28:39 +05:30
Murtuza Zabuawala
e23d307c56 Update copyright notices for 2019 2019-01-02 15:54:12 +05:30
Akshay Joshi
41c028f944 Ensure that null values handled properly in CSV download. Fixes #3780 2019-01-01 15:15:36 +05:30
Dave Page
12b7e03085 Add flask-migrate to the container doc build as it's now required. 2018-12-21 10:58:15 +00:00
Dave Page
cb880678cc Python 2.6 support is officially deprecated. 2018-12-20 09:15:26 +00:00
Dave Page
1141930178 Allow servers to be pre-loaded into container deployments. Fixes #3801 2018-12-05 17:16:46 +00:00
Dave Page
55402ec7d9 Run Postfix in the container build so passwords can be reset etc. Fixes #3599 2018-12-05 14:44:23 +00:00
Dave Page
be47390baf Fix the Docker build. 2018-10-29 11:01:47 +00:00
Dave Page
a2258c83e9 Chance an update to Node 8. Let's see how Jenkins likes this. 2018-09-14 17:04:51 +01:00
Dave Page
d7eb41fff4 Include a cacert file when needed for the upgrade check. Fixes #3185 2018-07-23 16:15:58 +01:00
Khushboo Vashi
43aa0c9f3c Fix wheel deps 2018-06-28 13:03:24 +01:00
Dave Page
fbbf9d1de2 Fix stupid typo 2018-06-28 12:56:33 +01:00
Dave Page
5f51c39e6f Delete the venv folder prior to upgrade. Fixes #3384 2018-06-17 21:10:17 -04:00
Dave Page
96544424dd Don't pipe the list of binaries through uniq.
It seems to be overflowing a buffer and truncating output with Python 3,
plus it's being fed a single line only so isn't actually doing anything.
2018-06-14 17:03:16 +01:00
Dave Page
1d322e2cd9 Enable building of the appbundle with Python 3.6. 2018-06-14 16:16:30 +01:00
Dave Page
2860e82c63 Fix Gunicorn binding for IPv4. 2018-05-31 10:57:09 -04:00
Dave Page
6719ff141b Correct package name 2018-05-31 10:49:30 -04:00
Dave Page
4372dd051e Include libffi-devel in the Docker build. 2018-05-31 10:48:32 -04:00
Dave Page
eec9714191 Bind the container server to ipv6 as well as ipv4 ports. Fixes #3392 2018-05-31 10:27:23 -04:00
Dave Page
b00931407e Fix failed yarn changes 2018-05-30 16:53:03 -04:00
Dave Page
bea176a646 Fix failed yarn changes 2018-05-30 16:52:54 -04:00
Dave Page
6a28b9ff26 Revert failed Yarn changes. 2018-05-30 16:52:37 -04:00
Dave Page
8bda4e0230 Remove duplicate options 2018-05-30 16:48:23 -04:00
Dave Page
189e307671 Fix syntax 2018-05-30 16:42:09 -04:00
Dave Page
b2d4c6ef9d Disable emojis in Yarn output. 2018-05-30 16:34:47 -04:00
Dave Page
f0b6fb0e5d Python 3 fixes 2018-05-02 12:05:17 +01:00
Dave Page
3ecfabfde5 Fix python wheel dependencies. 2018-04-19 17:08:06 +01:00
Dave Page
97cf58fdc8 Only avoid pre-built binaries for psycopg2 when building the Mac package, as some others (e.g. pbr) don't like being forced to source builds at the moment. 2018-04-10 09:29:40 +01:00
Максим Кольцов
05e2e3cb39 Update container build to use Alpine Linux and Gunicorn instead of CentOS and Apache. Fixes #3246
This results in a much more slim-line container, requiring fewer resources to run.
In addition, the majority of the build is now done using the Docker infrastructure, allowing for quicker rebuilds and better use of layers.
2018-04-04 16:18:17 +01:00
Murtuza Zabuawala
a95775ae49 Another attempt to fix the Python 2.6 deps. 2018-04-04 13:42:38 +01:00
Murtuza Zabuawala
c0cfc9f29b SQLAlchemy stopped supporting Python 2.6. 2018-04-04 12:59:05 +01:00
Murtuza Zabuawala
b7c86da586 Fix requirements for Python 2.6. 2018-04-04 12:26:44 +01:00
Murtuza Zabuawala
be055ce57d Update Python and JS modules. Fixes #3154 2018-04-04 10:47:01 +01:00
Murtuza Zabuawala
1a958a3951 Fix Python 2.6 support. 2018-02-19 10:22:23 +00:00
Dave Page
7192a2b675 Rewrite the runtime as a tray-based server which can launch a web browser. Fixes #3086 2018-02-05 15:32:14 +00:00
Dave Page
6f8066d261 Fix Python wheel dependencies. Fixes #3011 2018-01-15 09:15:46 +05:30
Magnus Hagander
601a7b1a5c Fix typo 2018-01-12 12:43:48 +00:00
Dave Page
8b3aecd137 Don't listen on port 443 if TLS is not enabled when launching the container. Fixes #2998 2018-01-11 15:04:11 +00:00
Dave Page
89821c0d19 Update copyright notices for 2018. 2018-01-05 10:42:50 +00:00
Mark Deneen
3289a18a1a Remove any Apache HTTPD PID file before starting the container, to prevent failures during restart. 2018-01-03 12:54:52 +00:00
Dave Page
3b7656b3d5 Push HTTPD logs to container stdout/stderr as appropriate. Fixes #2920 2017-12-05 14:23:35 +09:00
Paresh More
a539147a0e Fix /NOICONS switch in the windows installer. Fixes #1366 2017-11-20 16:58:35 +00:00
Paresh More
8ff753deb8 Prevent the Windows installer accepting paths containing invalid characters. Fixes #1365 2017-11-20 16:38:20 +00:00
Dave Page
cf1440f41d Properly set the hostname for SSL use in containers. 2017-11-16 09:54:44 +00:00
Dave Page
a2c4fb02bc Show how the config/storage directory can be mounted on the host under docker. 2017-10-16 16:10:15 +01:00
Dave Page
845b296aed Add optional TLS support to the docker container. 2017-10-12 16:16:02 +01:00
Dave Page
bcba596408 Add the ability to build a basic Docker container. 2017-09-21 16:49:37 +01:00
Dave Page
8579909558 Ensure the SERVER_MODE changes don't break the PIP build. 2017-08-25 12:17:47 +01:00
Dave Page
dad6031bd6 Revert "Ensure dependencies are packaged in the tarball"
This reverts commit 6ad4a623c4.

ENOCOFFEE error
2017-07-11 09:23:57 +01:00
Dave Page
6ad4a623c4 Ensure dependencies are packaged in the tarball 2017-07-11 09:12:09 +01:00
Shruti B Iyer
659eb1c1e8 Bring React into the tree, and add linting and bundling framework for the JS etc. 2017-06-12 16:51:54 +01:00
Dave Page
4817b37742 Include backports.csv as a python dependency in the wheel. 2017-05-15 16:42:40 +01:00
Dave Page
001e0ce1cf Mac build fixes:
- Rebuild Python packages from scratch so we know what libraries they use
- Ensure the backports Python module has an __init__.py file.
2017-05-15 14:38:52 +01:00
Paresh More
b86fa15dbc Ensure the web/ directory is cleared before upgrading Windows installations. Fixes #2187 2017-04-10 12:05:09 +01:00
Dave Page
53c4e2df3b Add an appbundle-webkit build target to build an appbundle, but force the use of QtWebKit. 2017-04-05 12:35:07 +01:00
Dave Page
696343196a Fix Python 3 compatibility bug 2017-03-30 23:16:43 -04:00
Dave Page
6152d73f13 Fix some code inspection complaints 2017-03-25 22:04:52 -04:00
Dave Page
8bd648c5b6 Don't include the tools directory in the Mac & Windows packages 2017-03-25 22:04:52 -04:00
Dave Page
6abb906b20 Remove test related files from the mac appbundle. 2017-03-17 12:21:15 +00:00
Atira Odhner
c8fa0c4e28 Don't ship the node_modules directory with packages as it's only used for local testing. 2017-03-15 17:14:37 +00:00
Jonas Thelemann
8435257e00 Fix some typos in comments. 2017-03-07 10:35:24 +00:00
Dave Page
074f7a805e Build a universal Python wheel instead of per-python-version ones. Fixes #2210 2017-02-26 10:01:23 +00:00
Dave Page
631ddff485 Remove unused imports. 2017-02-26 09:16:19 +00:00
Dave Page
ec0099255a Use the correct requirements file when building the PIP package, and update the supported Python versions. 2017-02-26 09:14:22 +00:00
Dave Page
1e5de7e66e Merge the Python 2 & 3 requirements files, and break out test requirements into a separate file. 2017-02-26 09:06:17 +00:00
Atira Odhner
e3041f1113 Ensure the Mac Appbundle builds correctly both with and without code signing.
Correct current versions of Python/Qt while we're passing.
2017-02-16 11:25:32 +00:00
Dave Page
2ebaf56cc4 Update copyright year. Fixes #2109 2017-01-25 09:05:13 +00:00
Jonas Thelemann
2db705ad80 Add runtime/pgAdmin4 to .gitignore, and re-order entries for ease of maintenance. 2017-01-16 14:46:44 +00:00
Dave Page
f221194bcc Update copyright notices for 2017. 2017-01-04 13:33:32 +00:00
Dave Page
6f90fbc4df Use QT 5.7 by default on Mac, and allow builds with Python 3.5. 2016-11-24 09:19:50 +00:00
Dave Page
f6f020036f Fix a missing escape char 2016-11-23 13:43:12 +00:00
Dave Page
d7d0ff02c6 Specify the default PG binpath on Mac 2016-11-23 13:38:17 +00:00
Dave Page
9dcf61931a Include PostgreSQL utilities in the Mac App Bundle. This doesn't auto-configure pgAdmin to find them yet though. 2016-11-23 10:03:40 +00:00
Dave Page
020bf1d532 Minify HTML with Flask-HTMLMIN 2016-11-18 16:42:38 +00:00
Dave Page
8e60f33e65 Ensure the Mac Appbundle builds properly with QtWebEngine. 2016-11-17 16:22:45 +00:00
Dave Page
3abfebce1a Create a docs tarball along with the source tarball. Fixes #1964 2016-11-16 10:39:03 +00:00
Dave Page
9c7a9305aa Fix licence attachment on Mac DMG file. 2016-10-24 17:18:12 +01:00
Sandeep Thakkar
a1c0042a1e Use config_distro.py for all settings, and don't create/overwrite config_local.py. Partly fixes #1849 2016-10-19 14:10:28 +01:00
Justin Clift
3e743ad582 Minor fixes to the Mac appbundle build 2016-10-04 13:51:28 +01:00
Justin Clift
6458e4cafb Optionally sign both the Mac app bundle and the disk image. Fixes #1821 2016-10-04 12:51:14 +01:00
Dave Page
df64108708 Fix pip wheel production status. 2016-10-03 16:42:36 +01:00
Dave Page
fc9c4736c4 Fix python 3 compatibility 2016-10-03 16:37:20 +01:00
Dave Page
842d078142 Ensure the Mac package can find all the Python modules it needs, now that
PYTHONHOME is cleared for safety.
2016-09-02 15:19:54 +01:00
Dave Page
73988bcece Do a more sensible venv search on Windows, and don't update the
registry upon installation.
2016-06-16 16:22:45 +01:00
Dave Page
17b6053f45 Support distro-specific configs, and include docs in the PIP wheel.
A distro can now install a config_distro.py file alongside config.py
in which distro-specific configuration settings can be set, overriding
those in config.py. User settings in config_local.py will override
all other settings. This is useful to allow packagers to config
settings like the doc path, that may be specific to RPMs or Wheels
etc.
2016-06-15 20:56:27 +01:00
Dave Page
29fbbb581f Overhaul the PIP build system so it's less messy on disk during builds, and avoids packaging unnecessary files. 2016-06-15 17:09:05 +01:00
Paresh More
d8cbbae3a4 Cleanup a couple of issues missed when the Windows installer patch was committed. 2016-06-08 13:38:54 +01:00
Paresh More
47dccec915 Windows installer! 2016-06-08 12:29:21 +01:00
Dave Page
b15383e93d Change package status 2016-06-03 11:19:14 +01:00
Dave Page
a989840460 Tarball build target and script 2016-06-03 10:57:15 +01:00
Sandeep Thakkar
3074af101b Add Mac Appbundle generation support. 2016-06-02 13:56:56 +01:00
Dave Page
1724787f2a www.pgadmin.org now supports https. 2016-05-21 13:54:22 -04:00
Muhammad Aqeel
dc64160f82 Add a top level Makefile with a target and appropriate Python stuff to build a PIP package of the web code. 2016-03-14 10:26:59 +00:00