summaryrefslogtreecommitdiffstats
path: root/OS
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-11-28 20:11:25 +0100
committerstartxfr <clarue@startx.fr>2015-11-28 20:11:25 +0100
commit59bbf66b7b1e4490694f2c5f732ddf9380acf053 (patch)
tree4fa52b027fc6df1c9b50c3fbaf740086b595b786 /OS
parent348568c89ae1ad19270e930c02a1492bc43e99b1 (diff)
downloadphpmyadmin-59bbf66b7b1e4490694f2c5f732ddf9380acf053.tar.gz
phpmyadmin-59bbf66b7b1e4490694f2c5f732ddf9380acf053.tar.bz2
phpmyadmin-59bbf66b7b1e4490694f2c5f732ddf9380acf053.tar.xz
phpmyadmin-59bbf66b7b1e4490694f2c5f732ddf9380acf053.zip
debugging on services. renaming service and use of extends in global docker-copose used in test
Diffstat (limited to 'OS')
-rw-r--r--OS/docker-compose.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/OS/docker-compose.yml b/OS/docker-compose.yml
index 7d2f3f5..82b72af 100644
--- a/OS/docker-compose.yml
+++ b/OS/docker-compose.yml
@@ -1,12 +1,12 @@
-server:
+fedora:
build: ./
# image: sx-fedora
- container_name: "sx-fedora"
+ container_name: "os-fedora"
mem_limit: 1g
memswap_limit: 2g
cpu_shares: 2
restart: "on-failure:2"
environment:
- CONTAINER_TYPE: "OS"
+ CONTAINER_TYPE: "os"
CONTAINER_SERVICE: "fedora"
- CONTAINER_INSTANCE: "sx-fedora" \ No newline at end of file
+ CONTAINER_INSTANCE: "os-fedora" \ No newline at end of file