Skip to content

Commit

Permalink
Upgrade repo for Ubuntu 22.04.
Browse files Browse the repository at this point in the history
  • Loading branch information
YPCrumble committed Apr 13, 2023
1 parent 298b526 commit 0d6a23d
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.6, 3.7]
python-version: [3.9, "3.10", 3.11]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Environment-specific settings are in the `group_vars` directory.
A `certbot` role is also included for automatically generating and renewing
trusted SSL certificates with [Let's Encrypt][lets-encrypt].

**Tested with OS:** Ubuntu 18.04 LTS (64-bit), Ubuntu 16.04 LTS (64-bit).
**Tested with OS:** Ubuntu 22.04 LTS (64-bit), Ubuntu 20.04 LTS (64-bit).

**Tested with Cloud Providers:** [Digital Ocean][digital-ocean], [AWS][aws], [Rackspace][rackspace]

Expand Down Expand Up @@ -313,9 +313,9 @@ to run during deployment in most Django environments.

### Changing the Ubuntu release

The [Vagrantfile](Vagrantfile) uses the Ubuntu 20.04 LTS Vagrant box for a
The [Vagrantfile](Vagrantfile) uses the Ubuntu 22.04 LTS Vagrant box for a
64-bit PC that is published by Canonical in HashiCorp Atlas. To use Ubuntu
18.04 LTS instead, change the `config.vm.box` setting to `ubuntu/bionic64`.
20.04 LTS instead, change the `config.vm.box` setting to `ubuntu/focal64`.

### Changing the Python version used by your application

Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
VAGRANTFILE_API_VERSION = "2"

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "ubuntu/focal64"
config.vm.box = "ubuntu/jammy64"
config.ssh.forward_agent = false
config.vm.define "my-cool-app.local", primary: true do |app|
app.vm.hostname = "my-cool-app"
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use the official Ubuntu 20.04 base image from the Docker repository
FROM ubuntu:focal
FROM ubuntu:jammy

# Allow processes to detect that they are being run in a container
ENV container oci
Expand Down
2 changes: 1 addition & 1 deletion group_vars/development/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ application_name: django_default_project
#
# More info here: https://launchpad.net/~fkrull/+archive/ubuntu/deadsnakes
enable_deadsnakes_ppa: true
virtualenv_python_version: python3.9
virtualenv_python_version: python3.11


# Git settings.
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM {{ item.registry.url }}/{{ item.image }}
FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python python-is-python3 sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python2-dnf bash && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
Expand Down
4 changes: 2 additions & 2 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ driver:
lint: |
yamllint .
platforms:
- name: instance-xenial
- name: instance-jammy
groups:
- vagrant
image: ubuntu
image_version: xenial
image_version: jammy
privileged: true
- name: instance-focal
groups:
Expand Down
6 changes: 3 additions & 3 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-r requirements.txt

molecule==3.3.4
molecule-docker==0.2.4
testinfra==3.2.1
molecule==4.0.4
molecule-docker==2.1.0
pytest-testinfra==7.0.1
yamllint==1.19.0

0 comments on commit 0d6a23d

Please sign in to comment.