From c535246dac63ee06659db4231fb9650c1adfdaef Mon Sep 17 00:00:00 2001 From: David Andersen Date: Thu, 14 Apr 2016 22:05:59 -0700 Subject: [PATCH 1/2] added CA root; removed domain cert --- factorio.crt | 56 +++++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/factorio.crt b/factorio.crt index e4525dc..67de129 100644 --- a/factorio.crt +++ b/factorio.crt @@ -1,35 +1,4 @@ -----BEGIN CERTIFICATE----- -MIIFUzCCBDugAwIBAgIRAM0lAXnqiIwRxaRxtw5IQLEwDQYJKoZIhvcNAQELBQAw -gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO -BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD -VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg -Q0EwHhcNMTYwNDExMDAwMDAwWhcNMTcwNTI1MjM1OTU5WjBcMSEwHwYDVQQLExhE -b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHjAcBgNVBAsTFUVzc2VudGlhbFNTTCBX -aWxkY2FyZDEXMBUGA1UEAwwOKi5mYWN0b3Jpby5jb20wggEiMA0GCSqGSIb3DQEB -AQUAA4IBDwAwggEKAoIBAQCy08rHFOfP9sHaQvfwcBMcPAf7LlzyYOVjIh0eG79m -uznOykPo6C+BpUlABo5UBvrMhkjinaDoXqYtWAODjSuwnj6tllwsSoGcOTU+Rw0R -nTqTqaVHMGJ6hx1VUF/iUuDIxZdcwjC2M3n0xv7AwHKg3ivGxiS62B72+XgKfsVU -Q4XiAcVqocqr3B04rWPqH+TEp6c4uLyBZwiwMUipGK6FCzvhZYf4H42TC21293hw -x0xGx58kS4l404dEva2P/V8hxvA1TNDU8upFbf+6N0XkqTZPLhUvEdhBEdmCORUa -QTpp7eiEsYWNeMeiEeb+n0gn993dGxA/CzkJYkcOLKptAgMBAAGjggHZMIIB1TAf -BgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0Oija5zAdBgNVHQ4EFgQUChOBWzrS -51DbGHNSHs4E1lsVWB4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD -VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCME8GA1UdIARIMEYwOgYLKwYBBAGy -MQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNvbS9D -UFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29tb2Rv -Y2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5j -cmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5jb21v -ZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNB -LmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCcGA1Ud -EQQgMB6CDiouZmFjdG9yaW8uY29tggxmYWN0b3Jpby5jb20wDQYJKoZIhvcNAQEL -BQADggEBAE+OOhuy0VIDuqD2mnJj2hySi8I3GcCp7aZkuqx/EACop9MBKkSa5oay -XZEzmmaLhpvLFULtwmvVpAEhbVpf+B3HZZ2rrhbW3WhUVMrIHPFT+sgDLPy6fNO6 -7gep0X97tpbTpXT29V8g1WTiDNeuMWEhplfJx2q65CmeRdZOMRJrkivZrkofjmOy -GcrehfI1xXTZ/mE1DNWnYsLbM8+V9doeM+xgg48z8xJ8F6q5JTLcmv8fISqzbERV -8+tPkffn29pXLq18c/23cfEQZCWPB/SMh9BTfmDgVAprQ3iyYOsxw0Ga9LzLQydY -S4oG0jnVW1AoqAJfBluwGcCZ7iNzuC8= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- MIIGCDCCA/CgAwIBAgIQKy5u6tl1NmwUim7bo3yMBzANBgkqhkiG9w0BAQwFADCB hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV @@ -96,3 +65,28 @@ B5a6SE2Q8pTIqXOi6wZ7I53eovNNVZ96YUWYGGjHXkBrI/V5eu+MtWuLt29G9Hvx PUsE2JOAWVrgQSQdso8VYFhH2+9uRv0V9dlfmrPb2LjkQLPNlzmuhbsdjrzch5vR pu/xO28QOG8= -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs +IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290 +MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux +FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h +bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v +dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt +H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9 +uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX +mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX +a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN +E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0 +WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD +VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0 +Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU +cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx +IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN +AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH +YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 +6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC +Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX +c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a +mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= +-----END CERTIFICATE----- From 7d5e58d4a032600003f67afe967dcf5e21877e22 Mon Sep 17 00:00:00 2001 From: David Andersen Date: Thu, 14 Apr 2016 22:06:32 -0700 Subject: [PATCH 2/2] re-enabled SSL security --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 010de5b..f1da84c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ MAINTAINER zopanix WORKDIR /opt COPY ./smart_launch.sh /opt +COPY ./factorio.crt /opt VOLUME /opt/factorio/saves /opt/factorio/mods @@ -16,10 +17,8 @@ ENV FACTORIO_AUTOSAVE_INTERVAL=2 \ FACTORIO_SHA1=77d92ecc52989f3283462fd5c9b5ba07eb6081cc RUN apk --update add bash curl && \ - curl -L -k https://www.factorio.com/get-download/$VERSION/headless/linux64 -o /tmp/factorio_headless_x64_$VERSION.tar.gz && \ - ls -al /tmp && \ - sha1sum -b /tmp/factorio_headless_x64_$VERSION.tar.gz && \ - echo "$FACTORIO_SHA1 /tmp/factorio_headless_x64_$VERSION.tar.gz" | sha1sum -b -c && \ + curl -sSL --cacert /opt/factorio.crt https://www.factorio.com/get-download/$VERSION/headless/linux64 -o /tmp/factorio_headless_x64_$VERSION.tar.gz && \ + echo "$FACTORIO_SHA1 /tmp/factorio_headless_x64_$VERSION.tar.gz" | sha1sum -c && \ tar xzf /tmp/factorio_headless_x64_$VERSION.tar.gz && \ rm /tmp/factorio_headless_x64_$VERSION.tar.gz