Skip to content

Commit

Permalink
p1gen4 (#37)
Browse files Browse the repository at this point in the history
* p1gen4

* Remove cups

* Fix security repo

* Fix python2

* Fix python2 packages

* Fix java version

* Fix docker role

* Disable fzf

* Fix gimp

* Disable packer

* Disable terraform

* Fix gvfs

* Fix fusesmb

* Fix exfat-utils

* fuse3

* Fix thunderbird lightning

* Fix thunderbird enigmail

* Disable thunderbird extensions

* Fix rxvt

* Fix vulkan

* Disable ubuntu font

* Disable kismet

* Disable kismet

* Disable qt4-qtconfig

* Remove non-existing software

* Add missing sound firmware

* Install libreoffice

* Add vim packages

* Lower retries

* Default tools

* Fix clipmenu installation

* Switch to bullseye
  • Loading branch information
cytopia authored Jun 11, 2022
1 parent b338d78 commit 3e485e2
Show file tree
Hide file tree
Showing 24 changed files with 1,063 additions and 42 deletions.
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# vim:set ft=dockerfile:
FROM debian:stretch
FROM debian:bullseye
MAINTAINER "cytopia" <[email protected]>

RUN set -eux \
&& apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \
python-apt \
python-dev \
python-jmespath \
python-pip \
python-setuptools \
python3-apt \
python3-dev \
python3-jmespath \
python3-pip \
python3-setuptools \
sudo \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get purge -y --autoremove

RUN set -eux \
&& pip install wheel \
&& pip install ansible
&& pip3 install wheel \
&& pip3 install ansible

# Add user with password-less sudo
RUN set -eux \
Expand Down
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ TAG = latest

# Ansible variables
VERBOSE=
PROFILE=cytopia-t470p
PROFILE=cytopia-p1gen4
ARG=

.PHONY: help build-docker test-docker-full test-docker-random test-docker-single itest-docker-full itest-docker-random itest-docker-single
Expand Down Expand Up @@ -98,13 +98,13 @@ ifneq ($(USER),root)
endif
DEBIAN_FRONTEND=noninteractive apt-get update -qq
DEBIAN_FRONTEND=noninteractive apt-get install -qq -q --no-install-recommends --no-install-suggests \
python-apt \
python-dev \
python-jmespath \
python-pip \
python-setuptools
pip install wheel
pip install ansible
python3-apt \
python3-dev \
python3-jmespath \
python3-pip \
python3-setuptools
pip3 install wheel
pip3 install ansible

# (Step 2/4) Add new Debian sources
deploy-apt-sources:
Expand Down
Loading

0 comments on commit 3e485e2

Please sign in to comment.