4.0 rc3

.circleci/config.yml

@@ -1,3 +1,4 @@
+#generated via: polly generate --mirror=circleci --registry=ghcr.io/unhookd > .circleci/config.yml
 ---
 workflows:
   version: 2
@@ -8,15 +9,15 @@ workflows:
 version: 2
 jobs:
   primary:
-    working_directory: "/home/app/polly"
+    #working_directory: "/home/app/polly"
     steps:
     - checkout
     - run:
         name: primary
         command: |-
-          echo DEMO!!!!
           bundle config set --local path vendor/bundle
           bundle install
           bundle exec rspec
+          polly help
     docker:
-    - image: ghcr.io/unhookd/polly:3.0-rc1
+    - image: ghcr.io/unhookd/polly:4.0-rc-3

.dockerignore

@@ -5,7 +5,7 @@ vendor
 .circleci
 .github
 Dockerfile
-Pollyfile
 Dockerfile.default
 .dockerignore
 Gemfile
+*.swp

.github/workflows/primary.yml

@@ -16,8 +16,8 @@ jobs:
 
     container:
       options: "--user 0"
-      #image: ubuntu:jammy-20220421
-      image: ghcr.io/unhookd/polly:3.0-rc1@sha256:7cc65086b101fe352a8ff83180888f0f7079b2f80139b0f39ba7b2a4cb34b168
+      image: public.ecr.aws/debian/debian:bookworm-20240311-slim
+      #image: ghcr.io/unhookd/polly:4.0-rc-3@sha256:1169fa172ec82abfaa368396aaad8be59d1879e76fcd115495567598d7500586
 
     steps:
     - uses: actions/checkout@v3
@@ -26,6 +26,12 @@ jobs:
       run: |
         set -ex
 
+        export DEBIAN_FRONTEND="noninteractive"
+        export LC_ALL="C.UTF-8"
+        export LANG="en_US"
+        export LANGUAGE="en_US"
+        export ACCEPT_EULA="y"
+
         (getent group alpha || groupadd --gid 121 alpha);
         (getent group tau || groupadd --gid 123 tau);
         (getent group beta || groupadd --gid 134 beta);
@@ -36,15 +42,16 @@ jobs:
         (getent passwd runner || useradd --uid 1001 --home-dir /home/runner --create-home --shell /bin/bash runner --groups alpha,beta,docker,theta,zeta,tau);
         apt-get update; apt-get install -y locales locales-all; apt-get clean;
         test -e /usr/lib/locale/locale-archive || ((locale-gen --purge en_US); (echo -e "LANG=$LANG\nLANGUAGE=$LANGUAGE\n" | tee /etc/default/locale); (locale-gen $LANGUAGE); (dpkg-reconfigure locales));
-        apt-get update; apt-get install -y vim git curl apt-transport-https aptitude ca-certificates apt-utils software-properties-common docker.io build-essential libyaml-dev ruby3* libruby3* ruby-bundler rubygems-integration rake amazon-ecr-credential-helper; apt-get clean;
-        curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add;
-        apt-add-repository "deb http://apt.kubernetes.io/ kubernetes-xenial main";
+        apt-get update; apt-get install -y vim git curl apt-transport-https aptitude ca-certificates apt-utils software-properties-common docker.io build-essential libyaml-dev ruby3* libruby3* ruby-bundler rubygems-integration rake amazon-ecr-credential-helper procps; apt-get clean;
+        test -e /etc/apt/keyrings/kubernetes-apt-keyring.gpg || (curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | gpg --batch --no-tty --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg);
+        echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list;
         apt-get update; apt-get install -y kubectl; apt-get clean;
         usermod -a -G $(grep docker /etc/group | cut -d: -f3) app;
         usermod -a -G $(grep docker /etc/group | cut -d: -f3) runner;
+        mkdir /tmp/buildkit && cd /tmp/buildkit && curl -sL -o buildkit.tar.gz "https://github.com/moby/buildkit/releases/download/v0.13.1/buildkit-v0.13.1.linux-amd64.tar.gz" && tar zxf buildkit.tar.gz && mv bin/buildctl /usr/local/bin && cd && rm -Rf /tmp/buildkit;
 
         mkdir -p /polly/safe/git /polly/safe/run /polly/safe/tmp /polly/app /app /__w/polly/polly;
-        chown -R app.alpha /home/app /polly /app /__w/polly/polly;
+        chown -R app:alpha /home/app /polly /app /__w/polly/polly;
         chown -R app /home/app /polly /app /__w/polly/polly;
         chown -R app /home/app;
         su app -s /bin/bash -c 'cd /__w/polly/polly && gem build polly.gemspec -o /home/app/polly-latest.gem';

.gitignore

@@ -1,3 +1,5 @@
 .bundle
 vendor
 Gemfile.lock
+Dockerfile-pollygen*
+*.swp

CHANGELOG.md

@@ -1,3 +1,69 @@
+# [4.31.0] - 2024-04-12 - Jon Bardin
+
+Add `polly tags` and initial prototype of build,test,deploy gitch ci
+
+#######
+
+# [4.30.0] - 2024-04-10 - Jon Bardin
+
+better async output
+
+#######
+
+# [4.29.0] - 2024-04-10 - Jon Bardin
+
+new version bits
+
+#######
+
+# [4.28.0] - 2024-04-01 - Jon Bardin
+
+Upgrade base images and to ruby3
+
+#######
+
+# [4.27.0] - 2024-02-07 - Jon Bardin
+
+Merge build features
+
+#######
+
+# [4.26.0] - 2023-05-19 - Jon
+
+add more build/run options
+
+#######
+
+# [4.25.0] - 2023-05-16 - Jon Bardin
+
+Allow `host-aliases` block to be defined and written out to /etc/hosts via cloud-init
+
+#######
+
+# [4.24.0] - 2023-05-16 - Jon Bardin
+
+repair wxh git push hooks
+
+#######
+
+# [4.23.0] - 2023-05-16 - Jon Bardin
+
+Add better version support
+
+#######
+
+# [2.22.0] - 2023-05-16 - Jon Bardin
+
+
+
+#######
+
+# [4.0.1] - 2023-05-16 - Jon Bardin
+
+Add support for multi-platform launch configuration
+
+#######
+
 # [2.20.0] - 2023-01-22 - Jon Bardin
 
 Test image container diff

Dockerfile.default

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile-upstream:master-experimental
-FROM ghcr.io/unhookd/polly:3.0-rc1@sha256:7cc65086b101fe352a8ff83180888f0f7079b2f80139b0f39ba7b2a4cb34b168 AS base
+FROM public.ecr.aws/debian/debian:bookworm-20240311-slim AS base
 USER root
 ENV DEBIAN_FRONTEND=noninteractive LC_ALL=C.UTF-8 LANG=en_US LANGUAGE=en_US ACCEPT_EULA=y
 RUN set -ex; \
@@ -13,12 +13,13 @@ RUN set -ex; \
     (getent passwd runner || useradd --uid 1001 --home-dir /home/runner --create-home --shell /bin/bash runner --groups alpha,beta,docker,theta,zeta,tau); \
     apt-get update; apt-get install -y locales locales-all; apt-get clean; \
     test -e /usr/lib/locale/locale-archive || ((locale-gen --purge en_US); (echo -e "LANG=$LANG\nLANGUAGE=$LANGUAGE\n" | tee /etc/default/locale); (locale-gen $LANGUAGE); (dpkg-reconfigure locales)); \
-    apt-get update; apt-get install -y vim git curl apt-transport-https aptitude ca-certificates apt-utils software-properties-common docker.io build-essential libyaml-dev ruby3* libruby3* ruby-bundler rubygems-integration rake amazon-ecr-credential-helper; apt-get clean; \
-    curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add; \
-    apt-add-repository "deb http://apt.kubernetes.io/ kubernetes-xenial main"; \
+    apt-get update; apt-get install -y vim git curl apt-transport-https aptitude ca-certificates apt-utils software-properties-common docker.io build-essential libyaml-dev ruby3* libruby3* ruby-bundler rubygems-integration rake amazon-ecr-credential-helper procps; apt-get clean; \
+    test -e /etc/apt/keyrings/kubernetes-apt-keyring.gpg || (curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | gpg --batch --no-tty --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg); \
+    echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list; \
     apt-get update; apt-get install -y kubectl; apt-get clean; \
     usermod -a -G $(grep docker /etc/group | cut -d: -f3) app; \
     usermod -a -G $(grep docker /etc/group | cut -d: -f3) runner; \
+    mkdir /tmp/buildkit && cd /tmp/buildkit && curl -sL -o buildkit.tar.gz "https://github.com/moby/buildkit/releases/download/v0.13.1/buildkit-v0.13.1.linux-amd64.tar.gz" && tar zxf buildkit.tar.gz && mv bin/buildctl /usr/local/bin && cd && rm -Rf /tmp/buildkit; \
     true;
 # syntax=docker/dockerfile-upstream:master-experimental
 FROM base AS gem
@@ -32,7 +33,7 @@ COPY --chown=app bin /__w/polly/polly/bin
 COPY --chown=app doc /__w/polly/polly/doc
 RUN set -ex; \
     mkdir -p /polly/safe/git /polly/safe/run /polly/safe/tmp /polly/app /app /__w/polly/polly; \
-    chown -R app.alpha /home/app /polly /app /__w/polly/polly; \
+    chown -R app:alpha /home/app /polly /app /__w/polly/polly; \
     chown -R app /home/app /polly /app /__w/polly/polly; \
     chown -R app /home/app; \
     su app -s /bin/bash -c 'cd /__w/polly/polly && gem build polly.gemspec -o /home/app/polly-latest.gem'; \
@@ -43,6 +44,12 @@ WORKDIR /home/app
 COPY --chown=app --from=gem /home/app/polly-latest.gem /home/app/polly-latest.gem
 RUN set -ex; \
     gem install --no-document --minimal-deps /home/app/polly-latest.gem && grep -Rn '\.gem\.' /var/lib 2>/dev/null | cut -d: -f1 | sort | uniq | xargs -I{} rm {} && rm /home/app/polly-latest.gem; \
+    ln -sf /usr/local/bin/polly /bin/dockerfile-frontend; \
+    true;
+COPY --chown=app Pollyfile /home/app/Pollyfile
+COPY --chown=app config/git-repo/templates /home/app/config/git-repo/templates
+RUN set -ex; \
+    mkdir -p /polly/safe/git/polly/hooks && chown -R app:app /polly/safe; \
     true;
 USER app
-LABEL "org.opencontainers.image.description"="For pollyci"
+ENTRYPOINT ["/bin/dockerfile-frontend"]

Gemfile

@@ -4,7 +4,6 @@ gemspec
 
 ## https://github.com/rubygems/rubygems/issues/1104
 group "development" do
-  gem "guard-rspec"
   gem "rake"
   gem "rspec"
 end

Pollyfile

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
 @base = image {
-  stage "base", "ghcr.io/unhookd/polly:3.0-rc1@sha256:7cc65086b101fe352a8ff83180888f0f7079b2f80139b0f39ba7b2a4cb34b168"
-  #stage "base", "ghcr.io/unhookd/polly:3.0-rc1"
-  #stage "base", "ubuntu:jammy-20220421"
+  #stage "base", "ghcr.io/unhookd/polly:4.0-rc-3@sha256:1169fa172ec82abfaa368396aaad8be59d1879e76fcd115495567598d7500586"
+  stage "base", "public.ecr.aws/debian/debian:bookworm-20240311-slim"
+  #stage "base", "ghcr.io/unhookd/polly:4.0-rc-3"
 
   root
 
@@ -20,23 +20,27 @@
   group(1000, "theta")
   group(1001, "zeta")
 
-  useradd(1000, "app", "alpha,beta,docker,theta,zeta,tau")
+  useradd(1000, "polly", "alpha,beta,docker,theta,zeta,tau")
   useradd(1001, "runner", "alpha,beta,docker,theta,zeta,tau")
 
   apt %w{locales locales-all}
 
   run %q{test -e /usr/lib/locale/locale-archive || ((locale-gen --purge en_US); (echo -e "LANG=$LANG\nLANGUAGE=$LANGUAGE\n" | tee /etc/default/locale); (locale-gen $LANGUAGE); (dpkg-reconfigure locales))}
 
-  apt %w{vim git curl apt-transport-https aptitude ca-certificates apt-utils software-properties-common docker.io build-essential libyaml-dev ruby3* libruby3* ruby-bundler rubygems-integration rake amazon-ecr-credential-helper}
+  apt %w{vim git curl apt-transport-https aptitude ca-certificates apt-utils software-properties-common docker.io build-essential libyaml-dev ruby3* libruby3* ruby-bundler rubygems-integration rake amazon-ecr-credential-helper procps}
+
+  #run %q{curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add}
+  #run %q{apt-add-repository "deb http://apt.kubernetes.io/ kubernetes-xenial main"}
+  run %q{test -e /etc/apt/keyrings/kubernetes-apt-keyring.gpg || (curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | gpg --batch --no-tty --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg)}
+  run %q{echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list}
 
-  run %q{curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add}
-  run %q{apt-add-repository "deb http://apt.kubernetes.io/ kubernetes-xenial main"}
   apt %w{kubectl}
 
-  run %q{usermod -a -G $(grep docker /etc/group | cut -d: -f3) app}
+  run %q{usermod -a -G $(grep docker /etc/group | cut -d: -f3) polly}
   run %q{usermod -a -G $(grep docker /etc/group | cut -d: -f3) runner}
 
-  run %q{mkdir /tmp/buildkit && curl -sL -o buildkit.tar.gz "https://github.com/moby/buildkit/releases/download/v0.11.1/buildkit-v0.11.1.linux-amd64.tar.gz" && tar zxf buildkit.tar.gz && mv bin/buildctl /usr/local/bin && rm -Rf /tmp/buildkit}
+  buildkit_version = "v0.22.0"
+  run %Q{mkdir /tmp/buildkit && cd /tmp/buildkit && curl -sL -o buildkit.tar.gz "https://github.com/moby/buildkit/releases/download/#{buildkit_version}/buildkit-#{buildkit_version}.linux-amd64.tar.gz" && tar zxf buildkit.tar.gz && mv bin/buildctl /usr/local/bin && cd && rm -Rf /tmp/buildkit}
 }
 
 # image declares container artifacts
@@ -52,73 +56,100 @@
 
   #TODO: more prototype-z detection
   command("COPY") {
-    "--chown=app polly.gemspec VERSION CHANGELOG.md /__w/polly/polly/"
+    "--chown=polly polly.gemspec VERSION CHANGELOG.md /__w/polly/polly/"
   }
 
   command("COPY") {
-    "--chown=app Thorfile /__w/polly/polly/"
+    "--chown=polly Thorfile /__w/polly/polly/"
   }
 
   command("COPY") {
-    "--chown=app config /__w/polly/polly/config/"
+    "--chown=polly config /__w/polly/polly/config/"
   }
 
   command("COPY") {
-    "--chown=app lib /__w/polly/polly/lib"
+    "--chown=polly lib /__w/polly/polly/lib"
   }
 
   command("COPY") {
-    "--chown=app bin /__w/polly/polly/bin"
+    "--chown=polly bin /__w/polly/polly/bin"
   }
 
   command("COPY") {
-    "--chown=app doc /__w/polly/polly/doc"
+    "--chown=polly doc /__w/polly/polly/doc"
   }
 
-  run %q{mkdir -p /polly/app /app /__w/polly/polly}
-  run %q{chown -R app.alpha /home/app /polly /app /__w/polly/polly}
-  run %q{chown -R app /home/app /polly /app /__w/polly/polly}
-  run %q{chown -R app /home/app}
-  run %q{su app -s /bin/bash -c 'cd /__w/polly/polly && gem build polly.gemspec -o /home/app/polly-latest.gem'}
+  run %q{mkdir -p /polly/safe/git /polly/safe/run /polly/safe/tmp /polly/polly /polly /__w/polly/polly}
+  run %q{chown -R polly:alpha /home/polly /polly /polly /__w/polly/polly}
+  run %q{chown -R polly /home/polly /polly /polly /__w/polly/polly}
+  run %q{chown -R polly /home/polly}
+  run %q{su polly -s /bin/bash -c 'cd /__w/polly/polly && gem build polly.gemspec -o /home/polly/polly-latest.gem'}
 }
 
 # final bits are just the .gem install as if on end-user box
 @deploy = image {
   stage "deploy", @base.stage
 
   command("WORKDIR") {
-    "/home/app"
+    "/home/polly"
+  }
+
+  command("COPY") {
+    "--chown=polly --from=gem /home/polly/polly-latest.gem /home/polly/polly-latest.gem"
+  }
+
+  run %q{gem install --no-document --minimal-deps /home/polly/polly-latest.gem && grep -Rn '\.gem\.' /var/lib 2>/dev/null | cut -d: -f1 | sort | uniq | xargs -I{} rm {} && rm /home/polly/polly-latest.gem}
+
+  run %q{ln -sf /usr/local/bin/polly /bin/dockerfile-frontend}
+
+  command("COPY") {
+    "--chown=polly Pollyfile /home/polly/Pollyfile"
   }
 
   command("COPY") {
-    "--chown=app --from=gem /home/app/polly-latest.gem /home/app/polly-latest.gem"
+    "--chown=polly config/git-repo/templates /home/polly/config/git-repo/templates"
   }
 
-  run %q{gem install --no-document --minimal-deps /home/app/polly-latest.gem && grep -Rn '\.gem\.' /var/lib 2>/dev/null | cut -d: -f1 | sort | uniq | xargs -I{} rm {} && rm /home/app/polly-latest.gem}
+  command("COPY") {
+    "--chown=polly kubernetes /home/polly/kubernetes"
+  }
+
+  run %q{mkdir -p /polly/safe/git/polly/hooks && chown -R polly:polly /polly/safe}
 
   app
+
+  command("ENTRYPOINT") {
+    '["/bin/dockerfile-frontend"]'
+  }
 }
 
 #description("For pollyci")
 
-workflow_image = "ghcr.io/unhookd/polly:3.0-rc1"
-#TODO: !!!! make this make sense to configure workflow_image = "polly:latest"
+#workflow_image = "ghcr.io/unhookd/polly:3.0-rc1"
+#TODO: !!!! make this make sense to configure
+#workflow_image = "polly-registry:23443/polly-registry/polly:latest"
 
 @plain_workflow = plan {
   job("primary",
-    [{"image"=>workflow_image}],
     [
-      {"run"=>{"name"=>"demo","command"=>"echo DEMO!!!!"}},
+      #{"run"=>{"name"=>"demo","command"=>"echo DEMO?????"}},
+      #{"run"=>{"name"=>"demo","command"=>"sleep 300"}},
+      #{"run"=>{"name"=>"demo","command"=>"echo DEMO!!!!"}},
+      #{"run"=>{"name"=>"demo","command"=>"polly generate > Dockerfile"}},
+      #{"run"=>{"name"=>"demo","command"=>"polly help"}},
+      #{"run"=>{"name"=>"demo","command"=>"sleep infinity"}},
+      #{"run"=>{"name"=>"demo","command"=>"polly build"}},
       {"run"=>{"name"=>"config","command"=>"bundle config set --local path vendor/bundle"}},
       {"run"=>{"name"=>"bundler","command"=>"bundle install"}},
       {"run"=>{"name"=>"rspec","command"=>"bundle exec rspec"}},
-      {"run"=>{"name"=>"build","command"=>"buildctl --addr kube-pod://buildkitd build --frontend dockerfile.v0 --local context=. --local dockerfile=."}}
-    ],{},"/home/app/polly"
+      {"run"=>{"name"=>"demo","command"=>"polly help"}},
+      #{"run"=>{"name"=>"build","command"=>"pwd && ls -l && buildctl --timeout 120 --addr tcp://polly-buildkitd:1234 --tlsservername polly-buildkitd --tlscacert /certs/client/ca.pem --tlscert /certs/client/cert.pem --tlskey /certs/client/key.pem build --frontend dockerfile.v0 --local context=. --local dockerfile=."}}
+    ],{},"/home/polly/polly"
   )
 }
 
 @gitch_pipeline = continuous {
-  #TODO: !!!!
-  #publish @bootstrap_artifact
+  build @bootstrap_artifact
   test @plain_workflow
+  deploy @example_instance
 }