starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-11 21:10:29 +01:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

[PR #496] [MERGED] fix for Dockerfile #12066

New Issue
Closed
opened 2025-12-29 22:19:26 +01:00 by adam · 0 comments
adam commented 2025-12-29 22:19:26 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/496
Author: @rfdrake
Created: 8/22/2016
Status: ✅ Merged
Merged: 8/22/2016
Merged by: @jeremystretch

Base: develop ← Head: develop

📝 Commits (1)

📊 Changes

1 file changed (+4 additions, -3 deletions)

View changed files

📝 Dockerfile (+4 -3)

📄 Description

I had left a couple of statements in that I used while testing the new file.
Together they broke in a way I couldn't really test until the code was
merged into the develop branch.

I believe I've fixed it so that the "master" branch and "develop"
branch can use the same Dockerfile options. You override which branch
it pulls by setting a build-args variable, either via docker-compose or
in the docker build options.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/netbox-community/netbox/pull/496 **Author:** [@rfdrake](https://github.com/rfdrake) **Created:** 8/22/2016 **Status:** ✅ Merged **Merged:** 8/22/2016 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `develop` ← **Head:** `develop` --- ### 📝 Commits (1) - [`8f34b6b`](https://github.com/netbox-community/netbox/commit/8f34b6b0b963a502f8e5a00554b98fb20dda1adc) fix for Dockerfile ### 📊 Changes **1 file changed** (+4 additions, -3 deletions) <details> <summary>View changed files</summary> 📝 `Dockerfile` (+4 -3) </details> ### 📄 Description I had left a couple of statements in that I used while testing the new file. Together they broke in a way I couldn't really test until the code was merged into the develop branch. I believe I've fixed it so that the "master" branch and "develop" branch can use the same Dockerfile options. You override which branch it pulls by setting a build-args variable, either via docker-compose or in the docker build options. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-29 22:19:26 +01:00
adam closed this issue 2025-12-29 22:19:27 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
beta
breaking change
complexity: high
complexity: low
complexity: medium
needs milestone
netbox
pending closure
plugin candidate
pull-request
Mirrored from GitHub Pull Request
 severity: high
severity: low
severity: medium
status: accepted
status: backlog
status: blocked
status: duplicate
status: needs owner
status: needs triage
status: revisions needed
status: under review
topic: GraphQL
topic: Internationalization
topic: OpenAPI
topic: UI/UX
topic: cabling
topic: event rules
topic: htmx navigation
topic: industrialization
topic: migrations
topic: plugins
topic: scripts
topic: templating
topic: testing
type: bug
type: deprecation
type: documentation
type: feature
type: housekeeping
type: translation
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
adam
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/netbox#12066
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?