diff options
author | Erik Rose <erik@mozilla.com> | 2015-12-02 09:47:38 +0300 |
---|---|---|
committer | Erik Rose <erik@mozilla.com> | 2015-12-02 19:12:57 +0300 |
commit | ec9a498622b0f1ae0319d890a5034a8f14b0a44c (patch) | |
tree | 59b9336cd489ffa6b82ce9f1c1734a62d594eac5 /Dockerfile-dev | |
parent | 4abe7ab93db598dd1122490b05ad10839f606ed6 (diff) |
Move OS-package bootstrappers to a private folder.
They're now used only by the le-auto build process. The new public interface for OS-level bootstrapping is le-auto --os-packages-only, which dispatches by OS automatically. That obsoletes install-deps.sh as well, saving some repetition.
Also, switch to mustache-style templating to avoid colliding with shell variable references.
To optimize for the docker cache, we could later add a shim script that sources just deb_common.sh and calls its bootstrap function.
Diffstat (limited to 'Dockerfile-dev')
-rw-r--r-- | Dockerfile-dev | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile-dev b/Dockerfile-dev index 838b60e8b..23b6a0a88 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -22,8 +22,8 @@ WORKDIR /opt/letsencrypt # TODO: Install non-default Python versions for tox. # TODO: Install Apache/Nginx for plugin development. -COPY bootstrap/ubuntu.sh /opt/letsencrypt/src/ubuntu.sh -RUN /opt/letsencrypt/src/ubuntu.sh && \ +COPY letsencrypt_auto/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto +RUN /opt/letsencrypt/src/letsencrypt-auto --os-packages-only && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* \ /tmp/* \ |