{"id":809319,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809319/?format=json","project":{"id":16,"url":"http://patchwork.ozlabs.org/api/1.0/projects/16/?format=json","name":"Patchwork","link_name":"patchwork","list_id":"patchwork.lists.ozlabs.org","list_email":"patchwork@lists.ozlabs.org","web_url":"http://jk.ozlabs.org/projects/patchwork/","scm_url":"git://github.com/getpatchwork/patchwork","webscm_url":"https://github.com/getpatchwork/patchwork"},"msgid":"<20170903151444.25660-3-dja@axtens.net>","date":"2017-09-03T15:14:42","name":"[2/4] Simplify docker-compose MySQL setup","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"898bc8a48ae4add605be07128305cffe90574a32","submitter":{"id":65792,"url":"http://patchwork.ozlabs.org/api/1.0/people/65792/?format=json","name":"Daniel Axtens","email":"dja@axtens.net"},"delegate":{"id":55761,"url":"http://patchwork.ozlabs.org/api/1.0/users/55761/?format=json","username":"stephenfin","first_name":"Stephen","last_name":"Finucane","email":"stephen.finucane@intel.com"},"mbox":"http://patchwork.ozlabs.org/project/patchwork/patch/20170903151444.25660-3-dja@axtens.net/mbox/","series":[{"id":1247,"url":"http://patchwork.ozlabs.org/api/1.0/series/1247/?format=json","date":"2017-09-03T15:14:40","name":"PostgreSQL fixes and test support","version":1,"mbox":"http://patchwork.ozlabs.org/series/1247/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809319/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","patchwork@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","patchwork@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xlc4P72Hkz9t2y\n\tfor ;\n\tMon, 4 Sep 2017 01:15:49 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xlc4P5yG0zDrnC\n\tfor ;\n\tMon, 4 Sep 2017 01:15:49 +1000 (AEST)","from mail-pg0-x242.google.com (mail-pg0-x242.google.com\n\t[IPv6:2607:f8b0:400e:c05::242])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xlc3h4jMDzDqjs\n\tfor ;\n\tMon, 4 Sep 2017 01:15:12 +1000 (AEST)","by mail-pg0-x242.google.com with SMTP id m15so3034225pgc.0\n\tfor ;\n\tSun, 03 Sep 2017 08:15:12 -0700 (PDT)","from localhost.localdomain (124-171-202-56.dyn.iinet.net.au.\n\t[124.171.202.56]) by smtp.gmail.com with ESMTPSA id\n\tt10sm7565993pgr.54.2017.09.03.08.15.08\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 03 Sep 2017 08:15:10 -0700 (PDT)"],"Authentication-Results":["ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=axtens.net header.i=@axtens.net\n\theader.b=\"Bg08CPlv\"; dkim-atps=neutral","lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=axtens.net header.i=@axtens.net\n\theader.b=\"Bg08CPlv\"; dkim-atps=neutral","lists.ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=axtens.net header.i=@axtens.net\n\theader.b=\"Bg08CPlv\"; dkim-atps=neutral"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=vV7Et+3ORnTQkNgQSi44pxEN4yAFjArmmvdrCE2Tq2I=;\n\tb=Bg08CPlvWT/yc+bhFXbyQzOsZewV/IPBhjMP0AG8SSM5hHUvrT13vPL8zfwMKfG69B\n\tuuQFHzw42ndP1oEaAfvFSO4M9VlvAcRxdfosB0xk7qqjTOlP8eTbcuAJiZRPu4jh7GX6\n\twBxCzawyO1RVjaKXorG3diSMubYxhC5IiifEc=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=vV7Et+3ORnTQkNgQSi44pxEN4yAFjArmmvdrCE2Tq2I=;\n\tb=rt/Hh6hHpwAWuWfnMvoRCdENuy9tw3nVo+7iSOisDdHG3KAPvLmh4yjDsb6gDXo5JO\n\tvZGVyU3GEKhvYgCop5c22GgVY4sKR6rfG7w3VSuwDzsfG6xUWyZvuA4mLzVN/DdKjUFm\n\tbfZ4LsQKDdQF41aT/aTntqWxSFczawyVRq/YhL3zimyFijMQdnoh8VOy6KFjFBa+8CjO\n\ts5DrZVafg/MRgGua+PBBndoGWuWFI25uLYftskAh2bD1/ZR3997i/9c/4WcoxzRZ+rxR\n\t0r+GMJjfcUiRFUGTFSW1QTgRKegzMMH4Xf97dGDtPbXbRB15n+QTLsBeJ8s62qYoe4Sr\n\t102g==","X-Gm-Message-State":"AHPjjUgvdSu0P8KxXKBcMYriy1f5Vz/otGlwLcHKrrq6KfuBP5mv0isB\n\tQLMyLYu/Xr5RaFrxDRVA8Q==","X-Google-Smtp-Source":"ADKCNb4ZMHH6Umy/n7Koid3OOFWPsBj6AP99R0sDdoHauyRDPsQvb6BSp7ybsq3FIp1Cv2aXvaabKw==","X-Received":"by 10.84.129.106 with SMTP id 97mr9704991plb.110.1504451710644; \n\tSun, 03 Sep 2017 08:15:10 -0700 (PDT)","From":"Daniel Axtens ","To":"patchwork@lists.ozlabs.org","Subject":"[PATCH 2/4] Simplify docker-compose MySQL setup","Date":"Mon, 4 Sep 2017 01:14:42 +1000","Message-Id":"<20170903151444.25660-3-dja@axtens.net>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170903151444.25660-1-dja@axtens.net>","References":"<20170903151444.25660-1-dja@axtens.net>","X-BeenThere":"patchwork@lists.ozlabs.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"Patchwork development ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org","Sender":"\"Patchwork\"\n\t"},"content":"This moves the config from a separate Dockerfile to something\nintegrated into the docker-compose.yml file.\n\nSigned-off-by: Daniel Axtens \n\n---\n\nHaving this set up with an image rather than a build makes it much\neasier for the postgres file to come.\n---\n docker-compose.yml | 9 +++++++--\n tools/docker/db/.dockerignore | 1 -\n tools/docker/db/Dockerfile | 10 ----------\n 3 files changed, 7 insertions(+), 13 deletions(-)\n delete mode 100644 tools/docker/db/.dockerignore\n delete mode 100644 tools/docker/db/Dockerfile","diff":"diff --git a/docker-compose.yml b/docker-compose.yml\nindex 7db3486ac734..47786eca9836 100644\n--- a/docker-compose.yml\n+++ b/docker-compose.yml\n@@ -5,9 +5,14 @@\n # or upgrade to v2 and use the build-arg to override it.\n \n db:\n- build: tools/docker/db\n+ image: mysql:5.7\n volumes:\n- - ./tools/docker/db/data:/var/lib/mysql\n+ - ./tools/docker/db/data:/var/lib/mysql\n+ environment:\n+ - MYSQL_ROOT_PASSWORD=password\n+ - MYSQL_USER=patchwork\n+ - MYSQL_PASSWORD=password\n+\n web:\n build: .\n dockerfile: ./tools/docker/Dockerfile\ndiff --git a/tools/docker/db/.dockerignore b/tools/docker/db/.dockerignore\ndeleted file mode 100644\nindex 1269488f7fb1..000000000000\n--- a/tools/docker/db/.dockerignore\n+++ /dev/null\n@@ -1 +0,0 @@\n-data\ndiff --git a/tools/docker/db/Dockerfile b/tools/docker/db/Dockerfile\ndeleted file mode 100644\nindex 5df9b5acb486..000000000000\n--- a/tools/docker/db/Dockerfile\n+++ /dev/null\n@@ -1,10 +0,0 @@\n-FROM mysql:5.7\n-\n-ENV MYSQL_ROOT_PASSWORD password\n-ENV MYSQL_USER patchwork\n-ENV MYSQL_PASSWORD password\n-\n-# We don't want to use the MYSQL_DATABASE env here because\n-# we want to be able to create the database with UTF-8 explictly.\n-# We also can't load in the data because it's in XML, yay.\n-\n","prefixes":["2/4"]}