Use Puppet 4

Dockerfile

@@ -19,6 +19,9 @@ RUN echo "Acquire::ForceIPv4 \"true\";" > /etc/apt/apt.conf
 RUN apt-get update
 RUN apt-get -y install vim man curl gnupg git apt-transport-https
 
+# install puppet 4
+RUN apt-get -y install puppet
+
 # There are some things we need to have in the filesystem tree so we can
 # run puppet for the first time and install and setup a fresh Weblate website
 # from scratch.
@@ -29,13 +32,6 @@ RUN sed -i "s@__TAILS_URL__@${tails_url}@" /usr/local/sbin/weblate-setup-project
 RUN sed -i "s@__DEB_URL__@${deb_url}@" /etc/puppet/hiera/common.yaml
 RUN sed -i "s@__WEBLATE_URL__@${weblate_url}@" /etc/puppet/hiera/common.yaml
 
-
-# install puppet 3.8
-RUN echo "deb https://deb.tails.boum.org/ puppet3x main" > /etc/apt/sources.list.d/puppet3x.list
-COPY apt/puppet.pref /etc/apt/preferences.d
-RUN apt-key add /etc/puppet/modules/site_apt/files/keys.d/tails-apt.asc
-RUN apt-get update; apt-get -y install puppet
-
 # /etc/sysctl.conf must be present
 RUN apt-get -y install procps
 

apt/puppet.pref

-Package: puppet puppet-common 
-Pin: origin deb.tails.boum.org
-Pin-Priority: 991

file-system/etc/puppet/puppet.conf

+[main]
+        confdir                                         = /etc/puppet
+        logdir                                          = /var/log/puppet
+        vardir                                          = /var/lib/puppet
+        ssldir                                          = $vardir/ssl
+        rundir                                          = /var/run/puppet
+        factpath                                        = $vardir/lib/facter
+        templatedir                                     = $confdir/templates
+        #certname                                       = puppetmaster01.example.com
+        #server                                         = puppet.example.com
+        #user                                           = pe-puppet
+        #group                                          = pe-puppet
+        #archive_files                          = true
+        #archive_file_server                    = puppet.example.com
+	basemodulepath = /etc/puppet/modules
+
+[agent]
+        report                                          = true
+        classfile                                       = $vardir/classes.txt
+        localconfig                                     = $vardir/localconfig
+        graph                                           = true
+        pluginsync                                      = true
+        environment                                     = production