Skip to content

Commit

Permalink
feat: Switch to native builds and drop chrome
Browse files Browse the repository at this point in the history
* Use Chromium
* Use Debian Buster Image as base
  • Loading branch information
hypery2k committed Nov 7, 2022
1 parent 591f585 commit 7d97392
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Various Docker Images for Building NodeJS, Java and Ansible artifacts
### What's installed

All images share common base:
* Chrome
* Chromium
* Docker
* Common tools:
* wget
Expand Down
2 changes: 1 addition & 1 deletion docker/_base/build.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
source "docker" "autogenerated_1" {
changes = ["VOLUME /data", "WORKDIR /data", "ENTRYPOINT /bin/bash"]
commit = true
image = "buildpack-deps:latest"
image = "buildpack-deps:buster"
pull = true
}

Expand Down
2 changes: 0 additions & 2 deletions docker/nodejs/ansible/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@
- { role: geerlingguy.nodejs, tags: [ 'nodejs' ], become: yes }
- { role: grzegorznowak.nvm_node, tags: [ 'nodejs' ], become: yes }
- { role: ../../roles/cleanup, tags: [ 'ansible' ], become: yes }
tasks:
- include: tasks/main.yml
9 changes: 0 additions & 9 deletions docker/nodejs/ansible/tasks/main.yml

This file was deleted.

2 changes: 1 addition & 1 deletion roles/prepare/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
raw: curl -sL https://deb.nodesource.com/setup_lts.x | sudo -E bash - && apt-get install -y nodejs

- name: Install Docker
raw: curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list && apt-get -y update && apt-get -y install docker-ce docker-ce-cli containerd.io
raw: curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list && apt-get -y update && apt-get -y install docker-ce docker-ce-cli containerd.io docker-compose-plugin

- name: Install Azure CLI
raw: curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
Expand Down
10 changes: 4 additions & 6 deletions roles/prepare/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ common_packages:
- "ca-certificates"
- "curl"
- "dumb-init"
- "freetds-dev"
- "gawk"
- "gettext"
- "git"
Expand All @@ -13,7 +14,7 @@ common_packages:
- "lsb-release"
- "gnupg"
- "rsync"
- "google-chrome-stable"
- "chromium"
- "sudo"
- "zip"
- "unzip"
Expand All @@ -27,21 +28,18 @@ common_packages:
- "postgresql-client"
# Blocked by https://github.com/dbcli/mssql-cli/pull/505
#- "mssql-tools"
- "mongodb-org-tools"
- "mongo-tools"
snap_packages:
- jq
- yq
apt_keys:
- "https://packages.cloud.google.com/apt/doc/apt-key.gpg"
- "https://dl-ssl.google.com/linux/linux_signing_key.pub"
- "https://packages.microsoft.com/keys/microsoft.asc"
- "https://www.mongodb.org/static/pgp/server-4.4.asc"
apt_repos:
- "deb https://apt.kubernetes.io/ kubernetes-xenial main"
- "deb http://packages.cloud.google.com/apt cloud-sdk main"
- "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
- "deb [arch=amd64] https://packages.microsoft.com/debian/10/prod buster main"
- "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main"
- "deb https://packages.microsoft.com/debian/10/prod buster main"
helm_plugins:
- "https://github.com/databus23/helm-diff"
- "https://github.com/jkroepke/helm-secrets"
Expand Down

0 comments on commit 7d97392

Please sign in to comment.