summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Smirnov <urpylka@gmail.com>2018-09-14 00:17:20 +0300
committerArtem Smirnov <urpylka@gmail.com>2018-09-14 00:56:38 +0300
commit9b564778a9c4b3dc0d9a3549a6152e52382e860d (patch)
tree44aa935fd967ad3e3b4dde5bfdafddb0124b3ba8
parentdef38a2ddc911c91a84b4fd694680d4a39582399 (diff)
Little fix after merge
Fix license & etc
-rw-r--r--Dockerfile10
-rw-r--r--NOTICE3
-rwxr-xr-xassets/gpg.conf.sh13
-rwxr-xr-xassets/nginx.conf.sh3
4 files changed, 19 insertions, 10 deletions
diff --git a/Dockerfile b/Dockerfile
index 40c15f5..449f740 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
1# Copyright 2018 Artem B. Smirnov 1# Copyright 2018 Artem B. Smirnov
2# Copyright 2018 Jon Azpiazu
2# Copyright 2016 Bryan J. Hong 3# Copyright 2016 Bryan J. Hong
3# 4#
4# Licensed under the Apache License, Version 2.0 (the "License"); 5# Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,9 +20,10 @@ LABEL maintainer="urpylka@gmail.com"
19 20
20ENV DEBIAN_FRONTEND noninteractive 21ENV DEBIAN_FRONTEND noninteractive
21 22
22# Update APT repository and install packages 23# Update APT repository & install packages
23RUN apt-get -q update \ 24RUN apt-get -q update \
24 && apt-get -y -q install aptly \ 25 && apt-get -y install \
26 aptly \
25 bzip2 \ 27 bzip2 \
26 gnupg \ 28 gnupg \
27 gpgv \ 29 gpgv \
@@ -31,8 +33,8 @@ RUN apt-get -q update \
31 wget \ 33 wget \
32 xz-utils \ 34 xz-utils \
33 apt-utils \ 35 apt-utils \
34 && apt-get clean \ 36 && apt-get clean \
35 && rm -rf /var/lib/apt/lists/* 37 && rm -rf /var/lib/apt/lists/*
36 38
37# Install Aptly Configuration 39# Install Aptly Configuration
38COPY assets/aptly.conf /etc/aptly.conf 40COPY assets/aptly.conf /etc/aptly.conf
diff --git a/NOTICE b/NOTICE
index 23425ea..52286d8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,7 +3,8 @@ docker-aptly
3Copyright 2018 Artem B. Smirnov 3Copyright 2018 Artem B. Smirnov
4 4
5This product contains software (https://github.com/urpylka/docker-aptly) developed 5This product contains software (https://github.com/urpylka/docker-aptly) developed
6by Artem Smirnov (http://github.com/urpylka) licensed under the Apache License. 6by Artem Smirnov (http://github.com/urpylka), and Jon Azpiazu (https://github.com/jonazpiazu)
7licensed under the Apache License.
7 8
8Copyright 2016 Bryan J. Hong 9Copyright 2016 Bryan J. Hong
9 10
diff --git a/assets/gpg.conf.sh b/assets/gpg.conf.sh
index 934e2b2..570d7e2 100755
--- a/assets/gpg.conf.sh
+++ b/assets/gpg.conf.sh
@@ -1,7 +1,12 @@
1#!/bin/bash 1#! /usr/bin/env bash
2mkdir -p ~/.gnupg/ 2
3touch ~/.gnupg/gpg.conf 3# Copyright 2018 Artem B. Smirnov
4cat >> ~/.gnupg/gpg.conf <<EOF 4# Copyright 2018 Jon Azpiazu
5# Licensed under the Apache License, Version 2.0
6
7mkdir -p /root/.gnupg/
8touch /root/.gnupg/gpg.conf
9cat >> /root/.gnupg/gpg.conf <<EOF
5personal-digest-preferences SHA256 10personal-digest-preferences SHA256
6cert-digest-algo SHA256 11cert-digest-algo SHA256
7default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed 12default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
diff --git a/assets/nginx.conf.sh b/assets/nginx.conf.sh
index be25bc3..cd1b403 100755
--- a/assets/nginx.conf.sh
+++ b/assets/nginx.conf.sh
@@ -1,5 +1,6 @@
1#! /usr/bin/env bash 1#! /usr/bin/env bash
2 2
3# Copyright 2018 Artem B. Smirnov
3# Copyright 2016 Bryan J. Hong 4# Copyright 2016 Bryan J. Hong
4# Licensed under the Apache License, Version 2.0 5# Licensed under the Apache License, Version 2.0
5 6
@@ -7,7 +8,7 @@ cat << EOF > /etc/nginx/conf.d/default.conf
7server_names_hash_bucket_size 64; 8server_names_hash_bucket_size 64;
8server { 9server {
9 root /opt/aptly/public; 10 root /opt/aptly/public;
10 server_name _; 11 server_name ${HOSTNAME};
11 12
12 location / { 13 location / {
13 autoindex on; 14 autoindex on;