airship
/
utils
Code Issues Proposed changes

Little fix after merge 

Fix license & etc
This commit is contained in:
Artem Smirnov 2018-09-14 00:17:20 +03:00
parent def38a2ddc
commit 9b564778a9
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

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

3
NOTICE
View File

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

13
assets/gpg.conf.sh
View File

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

3
assets/nginx.conf.sh
View File

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