Browse Source

Little fix after merge

Fix license & etc
Artem Smirnov 7 months ago
parent
commit
9b564778a9
4 changed files with 19 additions and 10 deletions
  1. 6
    4
      Dockerfile
  2. 2
    1
      NOTICE
  3. 9
    4
      assets/gpg.conf.sh
  4. 2
    1
      assets/nginx.conf.sh

+ 6
- 4
Dockerfile View File

@@ -1,4 +1,5 @@
1 1
 # Copyright 2018 Artem B. Smirnov
2
+# Copyright 2018 Jon Azpiazu
2 3
 # Copyright 2016 Bryan J. Hong
3 4
 #
4 5
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,9 +20,10 @@ LABEL maintainer="urpylka@gmail.com"
19 20
 
20 21
 ENV DEBIAN_FRONTEND noninteractive
21 22
 
22
-# Update APT repository and install packages
23
+# Update APT repository & install packages
23 24
 RUN apt-get -q update \
24
-  && apt-get -y -q install aptly \
25
+  && apt-get -y install \
26
+    aptly \
25 27
     bzip2 \
26 28
     gnupg \
27 29
     gpgv \
@@ -31,8 +33,8 @@ RUN apt-get -q update \
31 33
     wget \
32 34
     xz-utils \
33 35
     apt-utils \
34
- && apt-get clean \
35
- && rm -rf /var/lib/apt/lists/*
36
+  && apt-get clean \
37
+  && rm -rf /var/lib/apt/lists/*
36 38
 
37 39
 # Install Aptly Configuration
38 40
 COPY assets/aptly.conf /etc/aptly.conf

+ 2
- 1
NOTICE View File

@@ -3,7 +3,8 @@ docker-aptly
3 3
 Copyright 2018 Artem B. Smirnov
4 4
 
5 5
 This product contains software (https://github.com/urpylka/docker-aptly) developed
6
-by Artem Smirnov (http://github.com/urpylka) licensed under the Apache License.
6
+by Artem Smirnov (http://github.com/urpylka), and Jon Azpiazu (https://github.com/jonazpiazu)
7
+licensed under the Apache License.
7 8
 
8 9
 Copyright 2016 Bryan J. Hong
9 10
 

+ 9
- 4
assets/gpg.conf.sh View File

@@ -1,7 +1,12 @@
1
-#!/bin/bash
2
-mkdir -p  ~/.gnupg/
3
-touch ~/.gnupg/gpg.conf
4
-cat >> ~/.gnupg/gpg.conf <<EOF
1
+#! /usr/bin/env bash
2
+
3
+# Copyright 2018 Artem B. Smirnov
4
+# Copyright 2018 Jon Azpiazu
5
+# Licensed under the Apache License, Version 2.0
6
+
7
+mkdir -p  /root/.gnupg/
8
+touch /root/.gnupg/gpg.conf
9
+cat >> /root/.gnupg/gpg.conf <<EOF
5 10
 personal-digest-preferences SHA256
6 11
 cert-digest-algo SHA256
7 12
 default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed

+ 2
- 1
assets/nginx.conf.sh View File

@@ -1,5 +1,6 @@
1 1
 #! /usr/bin/env bash
2 2
 
3
+# Copyright 2018 Artem B. Smirnov
3 4
 # Copyright 2016 Bryan J. Hong
4 5
 # Licensed under the Apache License, Version 2.0
5 6
 
@@ -7,7 +8,7 @@ cat << EOF > /etc/nginx/conf.d/default.conf
7 8
 server_names_hash_bucket_size 64;
8 9
 server {
9 10
   root /opt/aptly/public;
10
-  server_name _;
11
+  server_name ${HOSTNAME};
11 12
 
12 13
   location / {
13 14
     autoindex on;

Loading…
Cancel
Save