Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to nautobot base templates #201

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion development/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NAUTOBOT_VER="1.0.1"
ARG NAUTOBOT_VER="1.4.1"
ARG PYTHON_VER=3.8
FROM ghcr.io/nautobot/nautobot-dev:${NAUTOBOT_VER}-py${PYTHON_VER}

Expand Down
20 changes: 7 additions & 13 deletions development/docker-compose.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ x-nautobot-build: &nautobot-build
context: "../"
dockerfile: "development/Dockerfile"
x-nautobot-base: &nautobot-base
image: "nautobot_circuit_maintenance/nautobot:${NAUTOBOT_VER}-py${PYTHON_VER}"
image: "ghcr.io/nautobot/nautobot-dev:${NAUTOBOT_VER}-py${PYTHON_VER}"
env_file:
- "dev.env"
- "creds.env"
Expand All @@ -23,10 +23,8 @@ services:
ports:
- "8080:8080"
depends_on:
redis:
condition: "service_started"
db:
condition: "service_healthy"
- "redis"
- "db"
<<: *nautobot-build
<<: *nautobot-base
worker:
Expand All @@ -38,10 +36,8 @@ services:
retries: 3
test: ["CMD", "nautobot-server", "health_check"]
depends_on:
nautobot:
condition: "service_started"
db:
condition: "service_healthy"
- "nautobot"
- "db"
<<: *nautobot-base
celery_worker:
healthcheck:
Expand All @@ -51,10 +47,8 @@ services:
retries: 3
test: ["CMD", "nautobot-server", "health_check"]
depends_on:
nautobot:
condition: "service_started"
db:
condition: "service_healthy"
- "nautobot"
- "db"
entrypoint:
- "sh"
- "-c" # this is to evaluate the $NAUTOBOT_LOG_LEVEL from the env
Expand Down
2 changes: 1 addition & 1 deletion nautobot_circuit_maintenance/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class CircuitMaintenanceConfig(PluginConfig):
author_email = "[email protected]"
description = "Automatically handle network circuit maintenance notifications."
base_url = "circuit-maintenance"
min_version = "1.0.0-beta.4"
min_version = "1.4.0"
max_version = "1.999"
required_settings = []
default_settings = {
Expand Down

This file was deleted.

Loading