Commit Graph

1234 Commits

Author SHA1 Message Date
Matthew Seaman
94eeca3be5 Update version numbers
After pulling in changes from upstream
2024-01-24 15:37:06 +00:00
Matthew Seaman
ce1b3bf6d5 Update README.md (#1)
* Update README.md

* We don't want to use the netbox-community pull-request template

* Update container building workflow

* Only build amd64 images
* Add our 'oxcert' branch as equivalent to upstream's 'release' branch

* Tag the version of the container as OxCERT's modification

This is just for the netbox container: the underlying netbox version
will come from upstream

* Build own own images and push to ghcr.io

* Only build amd64 images
* Only push images to GitHub Container Registry for the OxCERT organization

* Refer to our private copy in the GitHub Container Registry ghcr.io

* Use ghcr.io/oxcert/netbox for all netbox images

Build and push to this repo. Read from it with docker-compose

* Make releases relative to the 'oxcert' branch

rather than upstream's 'release' branch.  This is a different workflow
than used in any of our other repos, where PRs, changes, etc. are
first merged into a 'develop' branch, and the release process is to
merge accumulated changes into the main 'oxcert' branch.

Tag names for releases should follow whatever upstream is using with
"-oxcert" appended.

* Re-add the pull-request template

But in a very cut-down form.  We don't have an issue tracker on this
repo, and we assume the intentions and motivations for any PR will
have been discussed within the team already.  We do, however, want all
PRs to be against the 'develop' branch, in parallel to upstream's
workflow.

* On second thoughts, set container version to 1.0.0

This is OxCERT's version 1.0.0 of the containerized Netbox image which
is basically the same as the 2.7.0 netbox-community equivalent.

* Fix typo from upstream

Function should have been called `git_rebase()` rather than
duplicating the name of `git_merge()`
2024-01-24 15:36:39 +00:00
Tobias Genannt
e4357c7f3b Preparation for 2.8.0 2024-01-24 15:35:55 +00:00
renovate[bot]
f1da199f30 Update dependency dulwich to v0.21.7 2024-01-24 15:35:04 +00:00
renovate[bot]
33ea92a75d Update dependency psycopg to v3.1.16 2024-01-24 15:35:04 +00:00
renovate[bot]
d1a32b6808 Update actions/setup-python action to v5 2024-01-24 15:35:04 +00:00
renovate[bot]
147ee4e8fb Update dependency python3-saml to v1.16.0 2024-01-24 15:35:04 +00:00
renovate[bot]
7663903fa8 Update dependency django-auth-ldap to v4.6.0 2024-01-24 15:35:04 +00:00
renovate[bot]
accb58f280 Update dependency django-storages to v1.14.2 2024-01-24 15:35:04 +00:00
renovate[bot]
fe28b2082a Update dependency django-storages to v1.14.1 2024-01-24 15:35:04 +00:00
renovate[bot]
f5b4b1aa6f Update dependency psycopg to v3.1.12 2024-01-24 15:35:04 +00:00
renovate[bot]
ba375bb152 Update postgres Docker tag to v16 2024-01-24 15:35:04 +00:00
renovate[bot]
7823ba099e Update dependency psycopg to v3.1.11 2024-01-24 15:35:03 +00:00
renovate[bot]
f2e07e4f4c Update docker.io/postgres Docker tag to v16 2024-01-24 15:35:03 +00:00
renovate[bot]
0a6b3f4019 Update docker/login-action action to v3 2024-01-24 15:34:59 +00:00
renovate[bot]
4b92db52a2 Update docker/setup-qemu-action action to v3 2024-01-24 15:34:15 +00:00
renovate[bot]
4d3b700a43 Update docker/setup-buildx-action action to v3 2024-01-24 15:34:15 +00:00
Tobias Genannt
f45e82275b Update Nginx unit to 1.31 2024-01-24 15:34:15 +00:00
renovate[bot]
864033db2c Update actions/checkout action to v4 2024-01-24 15:34:15 +00:00
renovate[bot]
9846d28386 Update dependency django-storages to v1.14 2024-01-24 15:34:15 +00:00
renovate[bot]
f290cf13bf Update dependency dulwich to v0.21.6 2024-01-24 15:34:15 +00:00
Matthew Seaman
8642c1625f Merge branch 'develop' into oxcert 2023-10-27 09:13:01 +01:00
Matthew Seaman
8d5052b0ec Tag as version 1.1.0 -- added netbox-plugin-dns 2023-10-27 09:11:49 +01:00
Matthew Seaman
581acc0ae4
Add dns plugin (#4)
* Another requirements file for pip to process
* Install the plugins requirements alongside the other python modules
* Build the netbox-plugin-dns plugin into our container images
2023-10-27 09:05:35 +01:00
Matthew Seaman
2b38501a9f Use the latest container version for docker-compose 2023-10-24 10:52:53 +01:00
Matthew Seaman
e14752818f Merge branch 'develop' into oxcert 2023-10-23 15:42:30 +01:00
Matthew Seaman
7c10296bc3 Fix multi-arch builds
arm64 and amd64 images are overwriting each other.
2023-10-23 15:41:31 +01:00
Matthew Seaman
c3ee46e807
Multi-architecture builds are overwriting each other (#3)
So we end up with just the arm64 images in ghcr.io repository, since
they are the slowest to build.

Resynchronise the 'platforms' section in the workflow with
upstream. It's not a list of architectures, one per list entry.  It's
a single list entry mentioning all architectures.
2023-10-16 11:00:23 +01:00
Matthew Seaman
4e92f3329d Merge branch 'develop' into oxcert 2023-10-13 16:57:15 +01:00
Matthew Seaman
2fd8287ead Change the rebuild schedule to Mondays, Wednesdays and Fridays only
Let's make at least a token attempt to economize on those build
minutes.
2023-10-13 15:07:41 +01:00
Matthew Seaman
b8f5bd4eec Update VERSION for added arm64 images
New CPU architecture only, no functional change intended.
2023-10-13 15:03:25 +01:00
Matthew Seaman
a2a7dadf13
Ooops. Turns out we do actually want the arm64 images (#2)
Since that what several of the laptops run on.
2023-10-13 14:52:31 +01:00
Matthew Seaman
f24bc0a9e0
Update README.md (#1)
* Update README.md

* We don't want to use the netbox-community pull-request template

* Update container building workflow

* Only build amd64 images
* Add our 'oxcert' branch as equivalent to upstream's 'release' branch

* Tag the version of the container as OxCERT's modification

This is just for the netbox container: the underlying netbox version
will come from upstream

* Build own own images and push to ghcr.io

* Only build amd64 images
* Only push images to GitHub Container Registry for the OxCERT organization

* Refer to our private copy in the GitHub Container Registry ghcr.io

* Use ghcr.io/oxcert/netbox for all netbox images

Build and push to this repo. Read from it with docker-compose

* Make releases relative to the 'oxcert' branch

rather than upstream's 'release' branch.  This is a different workflow
than used in any of our other repos, where PRs, changes, etc. are
first merged into a 'develop' branch, and the release process is to
merge accumulated changes into the main 'oxcert' branch.

Tag names for releases should follow whatever upstream is using with
"-oxcert" appended.

* Re-add the pull-request template

But in a very cut-down form.  We don't have an issue tracker on this
repo, and we assume the intentions and motivations for any PR will
have been discussed within the team already.  We do, however, want all
PRs to be against the 'develop' branch, in parallel to upstream's
workflow.

* On second thoughts, set container version to 1.0.0

This is OxCERT's version 1.0.0 of the containerized Netbox image which
is basically the same as the 2.7.0 netbox-community equivalent.

* Fix typo from upstream

Function should have been called `git_rebase()` rather than
duplicating the name of `git_merge()`
2023-10-13 11:34:37 +01:00
Tobias Genannt
b47e85ab3f
Merge pull request #1062 from netbox-community/develop
Release 2.7.0
2023-08-30 23:22:57 +02:00
Tobias Genannt
28553202a4
Merge pull request #1039 from tobiasge/netbox-3.6
Prepare for Netbox 3.6
2023-08-30 21:34:45 +02:00
Tobias Genannt
69c5580a3e Fix #1061: Install openssh-client 2023-08-29 13:13:57 +02:00
Tobias Genannt
4d54bb172b
Merge pull request #1059 from NeodymiumFerBore/feat/remote-auth-backend-as-list
Map REMOTE_AUTH_BACKEND env var to list
2023-08-28 14:41:51 +02:00
Tobias Genannt
44d0f47fb5 Prepare for Netbox 3.6 2023-08-28 09:41:55 +02:00
NeodymiumFerBore
12af4233bd
Map REMOTE_AUTH_BACKEND env var to list 2023-08-25 11:26:36 +02:00
Tobias Genannt
f703bba5e1
Merge pull request #1043 from NeodymiumFerBore/fix/honor-default-config-value
Set REMOTE_AUTH_AUTO_CREATE_USER default to False
2023-08-16 08:49:48 +02:00
Tobias Genannt
dd0c0b795d
Merge pull request #1042 from toriningen/fix/1041-invalid-template
netbox.env: fixed unwanted string interpolation
2023-08-16 08:49:31 +02:00
Tobias Genannt
be7af2ea4c
Merge pull request #1045 from netbox-community/renovate/django-auth-ldap-4.x
Update dependency django-auth-ldap to v4.5.0
2023-08-09 08:19:05 +02:00
renovate[bot]
75690ac7dd
Update dependency django-auth-ldap to v4.5.0 2023-08-08 18:58:31 +00:00
NeodymiumFerBore
ec603633ea
Set REMOTE_AUTH_AUTO_CREATE_USER default to False 2023-08-04 23:49:44 +02:00
toriningen
c99172661c netbox.env: fixed unwanted string interpolation 2023-08-03 05:19:59 +00:00
Tobias Genannt
9bdd074ad7
Merge pull request #1034 from netbox-community/renovate/django-auth-ldap-4.x
Update dependency django-auth-ldap to v4.4.0
2023-07-23 11:52:19 +02:00
renovate[bot]
d69dacef09
Update dependency django-auth-ldap to v4.4.0 2023-07-22 19:52:18 +00:00
Tobias Genannt
ebc5900206
Merge pull request #1024 from florianschroen/2023-06-15_fix_volume_options
docker-compose.yml: fix volume mount options
2023-06-15 15:38:12 +02:00
Florian Schroen
8208dedb19 docker-compose.yml: fix volume mount options
`z` is valid only for bindmounts

When using with volumes a warning for each volume appears:

netbox$ docker compose up
[+] Building 0.0s (0/0)
WARN[0000] mount of type `volume` should not define `bind` option
WARN[0000] mount of type `volume` should not define `bind` option
WARN[0000] mount of type `volume` should not define `bind` option

This may appear only when using a docker-compose.override.yml
2023-06-15 12:14:05 +02:00
Tobias Genannt
0d748ed392
Merge pull request #1010 from tobiasge/image-update
Update Ubuntu und Nginx Unit
2023-05-11 13:01:21 +02:00