Commit 4e14d6e2 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'develop' into 'main'

Merging "develop" to "main" branch

See merge request !11
parents 059612e2 e2d0f192
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
# Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx
FROM nginx:1.19.4
FROM nginx:1.27.3
#Copy ci-dashboard-dist
COPY ./src /usr/share/nginx/html/nfvportal
#Copy default nginx configuration
+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@
					<address class='font-weight-light'><span class='font-weight-bold'>ETSI SDG OpenSlice</span> | <a
							href='https://osl.etsi.org/' class='text-white' style="color:#FFFFFF;">https://osl.etsi.org</a><br>The ETSI Software Development Group
						for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver
						Network Slice as a Service (NSaaS).
						Network as a Service (NaaS).
					</address>
					<address class='font-weight-light'><span class='font-weight-bold'>{{portalName}}</span> | <a
						href='{{weburl}}' class='text-white' style="color:#FFFFFF;">{{weburl}}</a><br>A portal that allows 5G
@@ -27,7 +27,7 @@
										class='fa fa-linkedin mr-2' style="margin-right: 0.5rem;"></i>LinkedIn</a></div>
						</div>
						<div class='col-sm-12 col-md-6 col-lg-3'>
							<div><a href='https://openslice.slack.com/' class='font-weight-light text-white' style="color:#FFFFFF;"><i
							<div><a href='https://join.slack.com/t/openslice/shared_invite/zt-29a1o45yc-3P7TYForhiMTWMFkL6V_Cw' class='font-weight-light text-white' style="color:#FFFFFF;"><i
										class='fa fa-slack mr-2' style="margin-right: 0.5rem;"></i>Slack</a></div>
						</div>
						<div class='col-sm-12 col-md-6 col-lg-3'>
@@ -53,7 +53,7 @@
								OpenSlice has received funding from various projects under European Programmes for research, technological development
								and demonstration. You may refer to our extensive <a href="https://osl.etsi.org/ecosystem/">ecosystem</a> for further details.
							</div>
							<div class='font-weight-light'>{{portalName}} running OSL version version 2024Q4 | 
							<div class='font-weight-light'>{{portalName}} running OSL version version 2025Q2 | 
								<a href='https://osl.etsi.org/files/SDG_OSL_Terms_and_Conditions.pdf' class='font-weight-light'>Terms and Conditions</a> | 
                        &copy; {{currentYear}} on behalf of <a target='_blank' href='https://osl.etsi.org/' title='osl.etsi.org' class='font-weight-light'>osl.etsi.org</a>
							</div>