Robert Sparks
d7d28a56ad
revert docker project name. Will make a more comprehensive change later
...
- Legacy-Id: 19643
2021-11-11 18:52:34 +00:00
Robert Sparks
536d787ab5
Explicitly specify a docker project for compose
...
- Legacy-Id: 19641
2021-11-11 18:25:09 +00:00
nick
d52ad4fbc2
misc: import docker improvements from 7.39.1.dev2
...
- Legacy-Id: 19629
2021-11-10 21:51:55 +00:00
Lars Eggert
5f2fe1fd1d
Make Cygwin tests work again
...
- Legacy-Id: 19446
2021-10-20 18:14:52 +00:00
Lars Eggert
2239ca2f3c
MacOS X fix from Mark Donnelly
...
- Legacy-Id: 19426
2021-10-15 13:56:44 +00:00
Lars Eggert
c46b0497b4
More fixes from Valery
...
- Legacy-Id: 19425
2021-10-14 18:56:18 +00:00
Lars Eggert
e0a739199c
Various fixes from and inspired by Valery Smylov's testing
...
- Legacy-Id: 19423
2021-10-14 10:54:53 +00:00
Lars Eggert
c4ba1ea75f
Rip out more unused stuff, and update copyright based on TLP
...
- Legacy-Id: 19418
2021-10-13 13:09:32 +00:00
Lars Eggert
6fb64998ce
Version of the new docker setup emailed out for testing on 2021-10-12
...
- Legacy-Id: 19417
2021-10-13 11:33:37 +00:00
Valery Smyslov
b0650c765e
Support of CygWin environment
...
- Legacy-Id: 18271
2020-07-25 17:26:37 +00:00
Henrik Levkowetz
afdfd8f0d6
Merged in a patch from mark@painless-security.com to add caching options to docker/run
...
- Legacy-Id: 17860
2020-05-20 21:38:53 +00:00
Henrik Levkowetz
ff7571f6e8
Merged in [17486] from valery@smyslov.net:
...
Add docker/run modifications to support Cygwin.
- Legacy-Id: 17506
Note: SVN reference [17486] has been migrated to Git commit f89dd2da7b
2020-03-22 16:29:11 +00:00
Valery Smyslov
f89dd2da7b
Add modifications to support Cygwin.
...
I don't know while FILEDIR includes "..", so I removed it...
Otherwise the changes should not affect Linux users, but please review.
- Legacy-Id: 17486
2020-03-21 17:41:20 +00:00
Henrik Levkowetz
f18be77bb8
Various docker environment fixes.
...
- Legacy-Id: 17026
2019-11-16 05:08:34 +00:00
Henrik Levkowetz
6e31552b7c
Updated docker files to build and run an image based on devuan:ascii instead of debian:jessie.
...
- Legacy-Id: 16784
2019-09-30 20:25:40 +00:00
Henrik Levkowetz
a99ca1584a
Merged in [15688] from mahoney@nostrum.com:
...
Fixed bad variable in title of requests.html. Fixes issue #2608 .
- Legacy-Id: 15707
Note: SVN reference [15688] has been migrated to Git commit 47e3ba8ba4
2018-11-03 11:46:40 +00:00
Henrik Levkowetz
9e71882e81
Rewrote docker/run to work around a missing switch in BSD xargs.
...
- Legacy-Id: 15437
2018-08-16 16:02:16 +00:00
Henrik Levkowetz
7bb8ce55a6
Fixed an issue with the image cleanup at the end of docker/run
...
- Legacy-Id: 14992
2018-04-02 09:25:14 +00:00
Henrik Levkowetz
691ce0c176
Set docker-internal UID and GID to match the external values for the user. Makes life easier when running docker under linux.
...
- Legacy-Id: 13907
2017-07-15 15:15:13 +00:00
Henrik Levkowetz
ad6f18fbf3
Fixed a docker/run current directory issue when invoked with a command to run.
...
- Legacy-Id: 13819
2017-07-09 15:24:34 +00:00
Henrik Levkowetz
a8db9e74c7
Updated docker/settings_local.py with new needed settings. Added a lot of quotes to docker/run in order to work better with paths containsing spaces. Touched a file during setup to be more debian compatible.
...
- Legacy-Id: 13703
2017-06-21 17:22:27 +00:00
Henrik Levkowetz
00d5ff8bfe
Tweaked docker/run slightly. Added 2 utility scripts docker/mailserver and docker/devserver, to start a debug smtp server and a development webserver in separate terminal windws. These assume that the docker image already is running. Tweaked the settings_local in docker/ to send email to the debug smtp server.
...
- Legacy-Id: 13139
2017-03-26 19:28:38 +00:00
Henrik Levkowetz
ce3b904b07
Changed docker/run in order to more easily be able to run multiple terminals against the docker enviroment, and also start the dev server and a debug smtp server in separate terminal windows.
...
- Legacy-Id: 13138
2017-03-26 19:14:29 +00:00
Henrik Levkowetz
ff89873566
Added support for Docker for Mac, which uses hypervisor virtualisation. The older VirtualBox based docker-machine should still work.
...
- Legacy-Id: 12389
2016-11-20 14:41:16 +00:00
Henrik Levkowetz
0d0aff855b
Fixed a few issues with the docker/run script.
...
- Legacy-Id: 11022
2016-03-28 21:46:34 +00:00
Henrik Levkowetz
02d341cae5
Updated docker-related files based on 6.17.0
...
- Legacy-Id: 10967
2016-03-22 21:10:33 +00:00
Henrik Levkowetz
10f2bc053d
Minor tweaks to the docker files.
...
- Legacy-Id: 10491
2015-11-15 16:18:22 +00:00
Henrik Levkowetz
56f791a2fd
Fix permission trouble writing to /dev/stderr when running within docker. Exit if running in an unexpected environment. Fixed a typo in an informational message. Refined the hanling of ~/.docker-info files. Improved the permission mods on the unpacked mysql files (matching the permissions mysql prefers).
...
- Legacy-Id: 10484
2015-11-14 23:06:40 +00:00
Henrik Levkowetz
5c008f2503
Tweaked a docker/run message.
...
- Legacy-Id: 10477
2015-11-14 16:16:24 +00:00
Henrik Levkowetz
e8992007b6
Code refactoring.
...
- Legacy-Id: 10475
2015-11-14 10:32:07 +00:00
Henrik Levkowetz
f8008a7ed1
Corrected the switched external:internal port mapping fields in docker/run.
...
- Legacy-Id: 10472
2015-11-13 18:27:20 +00:00
Henrik Levkowetz
5cd10c3152
Added support for running different containers mapping internal port 8000 to different external ports. Added additional text explaining why we won't run multiple containers from the same svn branch. Did som default value code refactoring.
...
- Legacy-Id: 10471
2015-11-13 17:59:30 +00:00
Henrik Levkowetz
a5435449cd
Tweaks to the docker setup to make it work nicely to run different docker containers for different SVN branches.
...
- Legacy-Id: 10466
2015-11-12 22:40:42 +00:00
Henrik Levkowetz
bfc42ae7bc
Updated docker/run with options to select a non-default docker-repository and docker image tag (which now defaults to the svn branch basename); added handling for missing docker environment variables, and for the docker virtual machine not running.
...
- Legacy-Id: 10460
2015-11-09 22:21:55 +00:00
Henrik Levkowetz
30c538790a
Removed parts of Dockerfile, simplifying it and reducing the image size. Modified and simplified the docker entrypoint script. Tweaked the cleanup actions of docker/run.
...
- Legacy-Id: 10455
2015-11-08 18:44:41 +00:00
Henrik Levkowetz
f8872fd3dd
Tweaked docker/run
...
- Legacy-Id: 10443
2015-11-07 22:14:22 +00:00
Henrik Levkowetz
95a001333b
Added more cleanup to the docker/run command
...
- Legacy-Id: 10439
2015-11-07 21:22:55 +00:00
Henrik Levkowetz
c2432107a3
Updated Dockerfile and the default settings_local for the docker image. Added docker-init.sh which is used in the docker image, and docker/run which is a wrapper which runs the docker image with suitable settings.
...
- Legacy-Id: 10436
2015-11-07 20:25:37 +00:00